Add latest changes from gitlab-org/gitlab@master

23 files changed, 32 insertions, 32 deletions

diff --git a/qa/qa/resource/deploy_token.rb b/qa/qa/resource/deploy_token.rb
index fca5ed83c87..f0f0da27412 100644
--- a/qa/qa/resource/deploy_token.rb
+++ b/qa/qa/resource/deploy_token.rb
@@ -6,7 +6,7 @@ module QA
       attr_accessor :name, :expires_at
 
       attribute :username do
-        Page::Project::Settings::Repository.perform do |page|
+        Page::Project::Settings::Repository.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.expand_deploy_tokens do |token|
             token.token_username
           end
@@ -14,7 +14,7 @@ module QA
       end
 
       attribute :password do
-        Page::Project::Settings::Repository.perform do |page|
+        Page::Project::Settings::Repository.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.expand_deploy_tokens do |token|
             token.token_password
           end
diff --git a/qa/qa/resource/file.rb b/qa/qa/resource/file.rb
index ca74654bf90..a870e7d5d26 100644
--- a/qa/qa/resource/file.rb
+++ b/qa/qa/resource/file.rb
@@ -27,7 +27,7 @@ module QA
 
         Page::Project::Show.perform(&:create_first_new_file!)
 
-        Page::File::Form.perform do |page|
+        Page::File::Form.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.add_name(@name)
           page.add_content(@content)
           page.add_commit_message(@commit_message)
diff --git a/qa/qa/resource/fork.rb b/qa/qa/resource/fork.rb
index 03bc1f0820b..54b0c2d0059 100644
--- a/qa/qa/resource/fork.rb
+++ b/qa/qa/resource/fork.rb
@@ -41,7 +41,7 @@ module QA
           fork_new.choose_namespace(user.name)
         end
 
-        Page::Layout::Banner.perform do |page|
+        Page::Layout::Banner.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.has_notice?('The project was successfully forked.')
         end
 
diff --git a/qa/qa/resource/issue.rb b/qa/qa/resource/issue.rb
index 8539eaeb337..a894e5c2033 100644
--- a/qa/qa/resource/issue.rb
+++ b/qa/qa/resource/issue.rb
@@ -25,7 +25,7 @@ module QA
 
         Page::Project::Show.perform(&:go_to_new_issue)
 
-        Page::Project::Issue::New.perform do |page|
+        Page::Project::Issue::New.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.add_title(@title)
           page.add_description(@description)
           page.create_new_issue
diff --git a/qa/qa/resource/kubernetes_cluster.rb b/qa/qa/resource/kubernetes_cluster.rb
index 27ab7b60211..6778094cee4 100644
--- a/qa/qa/resource/kubernetes_cluster.rb
+++ b/qa/qa/resource/kubernetes_cluster.rb
@@ -24,7 +24,7 @@ module QA
         Page::Project::Operations::Kubernetes::Add.perform(
           &:add_existing_cluster)
 
-        Page::Project::Operations::Kubernetes::AddExisting.perform do |page|
+        Page::Project::Operations::Kubernetes::AddExisting.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.set_cluster_name(@cluster.cluster_name)
           page.set_api_url(@cluster.api_url)
           page.set_ca_certificate(@cluster.ca_certificate)
@@ -34,7 +34,7 @@ module QA
         end
 
         if @install_helm_tiller
-          Page::Project::Operations::Kubernetes::Show.perform do |page|
+          Page::Project::Operations::Kubernetes::Show.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
             # We must wait a few seconds for permissions to be set up correctly for new cluster
             sleep 10
 
diff --git a/qa/qa/resource/label.rb b/qa/qa/resource/label.rb
index b5e88d8aefc..a9177ef3df6 100644
--- a/qa/qa/resource/label.rb
+++ b/qa/qa/resource/label.rb
@@ -28,7 +28,7 @@ module QA
         Page::Project::Menu.perform(&:go_to_labels)
         Page::Label::Index.perform(&:click_new_label_button)
 
-        Page::Label::New.perform do |page|
+        Page::Label::New.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.fill_title(@title)
           page.fill_description(@description)
           page.fill_color(@color)
diff --git a/qa/qa/resource/personal_access_token.rb b/qa/qa/resource/personal_access_token.rb
index f5c632cd8d2..f5bebd25202 100644
--- a/qa/qa/resource/personal_access_token.rb
+++ b/qa/qa/resource/personal_access_token.rb
@@ -16,7 +16,7 @@ module QA
         Page::Main::Menu.perform(&:click_settings_link)
         Page::Profile::Menu.perform(&:click_access_tokens)
 
-        Page::Profile::PersonalAccessTokens.perform do |page|
+        Page::Profile::PersonalAccessTokens.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.fill_token_name(name || 'api-test-token')
           page.check_api
           page.click_create_token_button
diff --git a/qa/qa/resource/project.rb b/qa/qa/resource/project.rb
index 157064dfe37..2e49f69bd55 100644
--- a/qa/qa/resource/project.rb
+++ b/qa/qa/resource/project.rb
@@ -30,13 +30,13 @@ module QA
       end
 
       attribute :repository_ssh_location do
-        Page::Project::Show.perform do |page|
+        Page::Project::Show.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.repository_clone_ssh_location
         end
       end
 
       attribute :repository_http_location do
-        Page::Project::Show.perform do |page|
+        Page::Project::Show.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.repository_clone_http_location
         end
       end
@@ -59,7 +59,7 @@ module QA
           Page::Group::Show.perform(&:go_to_new_project)
         end
 
-        Page::Project::New.perform do |page|
+        Page::Project::New.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.choose_test_namespace
           page.choose_name(@name)
           page.add_description(@description)
diff --git a/qa/qa/resource/project_imported_from_github.rb b/qa/qa/resource/project_imported_from_github.rb
index a160cdb3273..e4a9a8bcd3d 100644
--- a/qa/qa/resource/project_imported_from_github.rb
+++ b/qa/qa/resource/project_imported_from_github.rb
@@ -17,15 +17,15 @@ module QA
 
         Page::Group::Show.perform(&:go_to_new_project)
 
-        Page::Project::New.perform do |page|
+        Page::Project::New.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.click_import_project
         end
 
-        Page::Project::New.perform do |page|
+        Page::Project::New.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.click_github_link
         end
 
-        Page::Project::Import::Github.perform do |page|
+        Page::Project::Import::Github.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.add_personal_access_token(@personal_access_token)
           page.list_repos
           page.import!(@github_repository_path, @name)
diff --git a/qa/qa/resource/project_milestone.rb b/qa/qa/resource/project_milestone.rb
index 70640eac095..39077b64a22 100644
--- a/qa/qa/resource/project_milestone.rb
+++ b/qa/qa/resource/project_milestone.rb
@@ -18,7 +18,7 @@ module QA
       def fabricate!
         project.visit!
 
-        Page::Project::Menu.perform do |page|
+        Page::Project::Menu.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.click_issues
           page.click_milestones
         end
diff --git a/qa/qa/resource/sandbox.rb b/qa/qa/resource/sandbox.rb
index 6eff0e87ddc..47bd86440a0 100644
--- a/qa/qa/resource/sandbox.rb
+++ b/qa/qa/resource/sandbox.rb
@@ -18,11 +18,11 @@ module QA
       def fabricate!
         Page::Main::Menu.perform(&:go_to_groups)
 
-        Page::Dashboard::Groups.perform do |page|
-          if page.has_group?(path)
-            page.click_group(path)
+        Page::Dashboard::Groups.perform do |groups_page|
+          if groups_page.has_group?(path)
+            groups_page.click_group(path)
           else
-            page.click_new_group
+            groups_page.click_new_group
 
             Page::Group::New.perform do |group|
               group.set_path(path)
diff --git a/qa/qa/resource/snippet.rb b/qa/qa/resource/snippet.rb
index f58d7b5113f..23c17fdb32a 100644
--- a/qa/qa/resource/snippet.rb
+++ b/qa/qa/resource/snippet.rb
@@ -16,7 +16,7 @@ module QA
       def fabricate!
         Page::Dashboard::Snippet::Index.perform(&:go_to_new_snippet_page)
 
-        Page::Dashboard::Snippet::New.perform do |page|
+        Page::Dashboard::Snippet::New.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.fill_title(@title)
           page.fill_description(@description)
           page.set_visibility(@visibility)
diff --git a/qa/qa/resource/ssh_key.rb b/qa/qa/resource/ssh_key.rb
index 4e399ae730e..9b6494c11bc 100644
--- a/qa/qa/resource/ssh_key.rb
+++ b/qa/qa/resource/ssh_key.rb
@@ -17,7 +17,7 @@ module QA
         Page::Main::Menu.perform(&:click_settings_link)
         Page::Profile::Menu.perform(&:click_ssh_keys)
 
-        Page::Profile::SSHKeys.perform do |page|
+        Page::Profile::SSHKeys.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.add_key(public_key, title)
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
index 94d20106de4..de33349a8b2 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
@@ -8,7 +8,7 @@ module QA
         Page::Main::Login.perform(&:sign_in_using_credentials)
         Page::Main::Menu.perform(&:go_to_groups)
 
-        Page::Dashboard::Groups.perform do |page|
+        Page::Dashboard::Groups.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.click_new_group
 
           expect(page).to have_content(
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
index 0a999cf00fa..babe6f7741f 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
@@ -11,7 +11,7 @@ module QA
           Runtime::Browser.visit(:mattermost, Page::Mattermost::Login)
           Page::Mattermost::Login.perform(&:sign_in_using_oauth)
 
-          Page::Mattermost::Main.perform do |page|
+          Page::Mattermost::Main.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
             expect(page).to have_content(/(Welcome to: Mattermost|Logout GitLab Mattermost)/)
           end
         end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
index 1c1f552e224..07298b8a9be 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
@@ -15,7 +15,7 @@ module QA
         project.visit!
 
         Page::Project::Menu.perform(&:go_to_members_settings)
-        Page::Project::Settings::Members.perform do |page|
+        Page::Project::Settings::Members.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.add_member(user.username)
         end
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
index 70c03e10449..55e15b19200 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
@@ -30,7 +30,7 @@ module QA
         project.visit!
 
         Page::Project::Show.perform(&:go_to_members_settings)
-        Page::Project::Settings::Members.perform do |page|
+        Page::Project::Settings::Members.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.add_member(user.username)
         end
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb
index 567c6a83ddf..c4a6ce13f4c 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb
@@ -57,7 +57,7 @@ module QA
           @project.visit!
 
           Page::Project::Show.perform(&:create_new_file!)
-          Page::File::Form.perform do |page|
+          Page::File::Form.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
             page.select_template template[:file_name], template[:name]
           end
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
index 21785ca3ed3..b2eef38f896 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
@@ -35,7 +35,7 @@ module QA
 
       def view_commit
         @project.visit!
-        Page::Project::Show.perform do |page|
+        Page::Project::Show.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.click_commit(@commit_message)
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb
index c09c65a57a5..0a89f0c9d41 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb
@@ -57,7 +57,7 @@ module QA
           @project.visit!
 
           Page::Project::Show.perform(&:open_web_ide!)
-          Page::Project::WebIDE::Edit.perform do |page|
+          Page::Project::WebIDE::Edit.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
             page.create_new_file_from_template template[:file_name], template[:name]
 
             expect(page.has_file?(template[:file_name])).to be_truthy
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 e689ba4c69c..2c3f2c86c23 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
@@ -16,7 +16,7 @@ module QA
         validate_content('My First Wiki Content')
 
         Page::Project::Wiki::Edit.perform(&:click_edit)
-        Page::Project::Wiki::New.perform do |page|
+        Page::Project::Wiki::New.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           page.set_content("My Second Wiki Content")
           page.save_changes
         end
diff --git a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
index a04efb94def..4fca2db3d0f 100644
--- a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
+++ b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
@@ -23,7 +23,7 @@ module QA
           issue.title = 'Performance bar test'
         end
 
-        Page::Layout::PerformanceBar.perform do |page|
+        Page::Layout::PerformanceBar.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           expect(page).to have_performance_bar
           expect(page).to have_detailed_metrics
           expect(page).to have_request_for('realtime_changes') # Always requested on issue pages
diff --git a/qa/qa/tools/revoke_all_personal_access_tokens.rb b/qa/qa/tools/revoke_all_personal_access_tokens.rb
index 8a74f52324d..f14975c0e5e 100644
--- a/qa/qa/tools/revoke_all_personal_access_tokens.rb
+++ b/qa/qa/tools/revoke_all_personal_access_tokens.rb
@@ -32,7 +32,7 @@ module QA
 
         token_name = 'api-test-token'
 
-        Page::Profile::PersonalAccessTokens.perform do |page|
+        Page::Profile::PersonalAccessTokens.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
           while page.has_token_row_for_name?(token_name)
             page.revoke_first_token_with_name(token_name)
             print "\e[32m.\e[0m"