diff options
author | sliaquat <sliaquat@gitlab.com> | 2018-10-04 19:46:57 +0500 |
---|---|---|
committer | sliaquat <sliaquat@gitlab.com> | 2018-10-09 16:24:29 +0500 |
commit | b7a5b204ba4f8afc4fc627660c035d253dcd4d79 (patch) | |
tree | 73fff937b5f434a748d078d389d0e97ed03cc3ab /qa/qa/specs/features | |
parent | 867b4f066f362edde126cf8c0132430c3946f2cc (diff) | |
download | gitlab-ce-b7a5b204ba4f8afc4fc627660c035d253dcd4d79.tar.gz |
Reorganize menu filesqa-60-reorganize-menu-classes-squash-try
Add missed files
Use correct method
Implement review feedback
Add missing frozen_string_literal
Squash 5 commits
Diffstat (limited to 'qa/qa/specs/features')
15 files changed, 22 insertions, 22 deletions
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb index 1c7da930567..ae196349c6b 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb @@ -8,7 +8,7 @@ module QA # TODO, since `Signed in successfully` message was removed # this is the only way to tell if user is signed in correctly. # - Page::Menu::Main.perform do |menu| + Page::Main::Menu.perform do |menu| expect(menu).to have_personal_area end end diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb index c296296def6..217870531da 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb @@ -10,7 +10,7 @@ module QA # TODO, since `Signed in successfully` message was removed # this is the only way to tell if user is signed in correctly. # - Page::Menu::Main.perform do |menu| + Page::Main::Menu.perform do |menu| expect(menu).to have_personal_area end end diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb index 478a5cb9c4c..368c24d757f 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb @@ -10,7 +10,7 @@ module QA # TODO, since `Signed in successfully` message was removed # this is the only way to tell if user is signed in correctly. # - Page::Menu::Main.perform do |menu| + Page::Main::Menu.perform do |menu| expect(menu).to have_personal_area end end diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb index 2ef8de61441..d1cd9865aef 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb @@ -27,7 +27,7 @@ module QA imported_project # import the project - Page::Menu::Main.act { go_to_projects } + Page::Main::Menu.act { go_to_projects } Page::Dashboard::Projects.perform do |dashboard| dashboard.go_to_project(imported_project.name) end @@ -48,7 +48,7 @@ module QA end def verify_issues_import - Page::Menu::Side.act { click_issues } + Page::Project::Menu.act { click_issues } expect(page).to have_content('This is a sample issue') click_link 'This is a sample issue' @@ -66,7 +66,7 @@ module QA end def verify_merge_requests_import - Page::Menu::Side.act { click_merge_requests } + Page::Project::Menu.act { click_merge_requests } expect(page).to have_content('Improve README.md') click_link 'Improve README.md' @@ -101,7 +101,7 @@ module QA end def verify_wiki_import - Page::Menu::Side.act { click_wiki } + Page::Project::Menu.act { click_wiki } expect(page).to have_content('Welcome to the test-project wiki!') end diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb index 34bb6f1c197..97ac35e8dba 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb @@ -13,7 +13,7 @@ module QA push.commit_message = 'Add README.md' end - Page::Menu::Side.act { go_to_activity } + Page::Project::Menu.act { go_to_activity } Page::Project::Activity.act { go_to_push_events } diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb index 542f532a629..49d76f31e3a 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb @@ -17,7 +17,7 @@ module QA it 'user creates an issue' do create_issue - Page::Menu::Side.act { click_issues } + Page::Project::Menu.act { click_issues } expect(page).to have_content(issue_title) end diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb index 407a15800ab..922feadb4e1 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb @@ -11,7 +11,7 @@ module QA merge_request.fork_branch = 'feature-branch' end - Page::Menu::Main.perform { |main| main.sign_out } + Page::Main::Menu.perform { |main| main.sign_out } Page::Main::Login.perform { |login| login.sign_in_using_credentials } merge_request.visit! diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb index ddcbc94b1b1..984cea8ca10 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb @@ -11,7 +11,7 @@ module QA project.name = "only-fast-forward" end - Page::Menu::Side.act { go_to_settings } + Page::Project::Menu.act { go_to_settings } Page::Project::Settings::MergeRequest.act { enable_ff_only } merge_request = Factory::Resource::MergeRequest.fabricate! do |merge_request| diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/add_ssh_key_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/add_ssh_key_spec.rb index 84f663c4866..b163ca896a7 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/add_ssh_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/add_ssh_key_spec.rb @@ -16,8 +16,8 @@ module QA expect(page).to have_content("Title: #{key_title}") expect(page).to have_content(key.fingerprint) - Page::Menu::Main.act { go_to_profile_settings } - Page::Menu::Profile.act { click_ssh_keys } + Page::Main::Menu.act { go_to_profile_settings } + Page::Profile::Menu.act { click_ssh_keys } Page::Profile::SSHKeys.perform do |ssh_keys| ssh_keys.remove_key(key_title) diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb index 7c989bfd8cc..563393b3d07 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb @@ -28,8 +28,8 @@ module QA expect(page).to have_content('README.md') expect(page).to have_content('Test Use SSH Key') - Page::Menu::Main.act { go_to_profile_settings } - Page::Menu::Profile.act { click_ssh_keys } + Page::Main::Menu.act { go_to_profile_settings } + Page::Profile::Menu.act { click_ssh_keys } Page::Profile::SSHKeys.perform do |ssh_keys| ssh_keys.remove_key(key_title) diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb index 8009b9e8609..44dd85c1746 100644 --- a/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb @@ -40,7 +40,7 @@ module QA push.file_content = '# My Third Wiki Content' push.commit_message = 'Update Home.md' end - Page::Menu::Side.act { click_wiki } + Page::Project::Menu.act { click_wiki } expect(page).to have_content('My Third Wiki Content') end diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb index cdfe9b90e15..e901531b1bf 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb @@ -64,7 +64,7 @@ module QA expect(page).to have_content('Add .gitlab-ci.yml') - Page::Menu::Side.act { click_ci_cd_pipelines } + Page::Project::Menu.act { click_ci_cd_pipelines } expect(page).to have_content('All 1') expect(page).to have_content('Add .gitlab-ci.yml') diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb index 8352d13b06d..73af24e7f50 100644 --- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb @@ -28,7 +28,7 @@ module QA resource.image = 'gitlab/gitlab-runner:ubuntu' end - Page::Menu::Main.act { sign_out } + Page::Main::Menu.act { sign_out } end after(:all) do @@ -90,7 +90,7 @@ module QA sha1sum = Digest::SHA1.hexdigest(gitlab_ci) Page::Project::Show.act { wait_for_push } - Page::Menu::Side.act { click_ci_cd_pipelines } + Page::Project::Menu.act { click_ci_cd_pipelines } Page::Project::Pipeline::Index.act { go_to_latest_pipeline } Page::Project::Pipeline::Show.act { go_to_first_job } diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb index 4604936916b..bf2a1be5026 100644 --- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb +++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb @@ -51,13 +51,13 @@ module QA end project.visit! - Page::Menu::Side.act { click_ci_cd_settings } + Page::Project::Menu.act { click_ci_cd_settings } Page::Project::Settings::CICD.perform do |p| p.enable_auto_devops_with_domain("#{kubernetes_cluster.ingress_ip}.nip.io") end project.visit! - Page::Menu::Side.act { click_ci_cd_pipelines } + Page::Project::Menu.act { click_ci_cd_pipelines } Page::Project::Pipeline::Index.act { go_to_latest_pipeline } Page::Project::Pipeline::Show.perform do |pipeline| diff --git a/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb index 6ffdc55538a..af24b36b734 100644 --- a/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb +++ b/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb @@ -6,7 +6,7 @@ module QA it 'user creates a group with a mattermost team' do Runtime::Browser.visit(:gitlab, Page::Main::Login) Page::Main::Login.act { sign_in_using_credentials } - Page::Menu::Main.act { go_to_groups } + Page::Main::Menu.act { go_to_groups } Page::Dashboard::Groups.perform do |page| page.go_to_new_group |