Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 7 deletions

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 de33349a8b2..66c56c86fc8 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,10 +8,10 @@ module QA
         Page::Main::Login.perform(&:sign_in_using_credentials)
         Page::Main::Menu.perform(&:go_to_groups)
 
-        Page::Dashboard::Groups.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
-          page.click_new_group
+        Page::Dashboard::Groups.perform do |groups|
+          groups.click_new_group
 
-          expect(page).to have_content(
+          expect(groups).to have_content(
             /Create a Mattermost team for this group/
           )
         end
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 babe6f7741f..e66c12c1301 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,8 +11,8 @@ module QA
           Runtime::Browser.visit(:mattermost, Page::Mattermost::Login)
           Page::Mattermost::Login.perform(&:sign_in_using_oauth)
 
-          Page::Mattermost::Main.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
-            expect(page).to have_content(/(Welcome to: Mattermost|Logout GitLab Mattermost)/)
+          Page::Mattermost::Main.perform do |mattermost|
+            expect(mattermost).to have_content(/(Welcome to: Mattermost|Logout GitLab Mattermost)/)
           end
         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 07298b8a9be..abb46463ed2 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,8 +15,8 @@ module QA
         project.visit!
 
         Page::Project::Menu.perform(&:go_to_members_settings)
-        Page::Project::Settings::Members.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
-          page.add_member(user.username)
+        Page::Project::Settings::Members.perform do |members|
+          members.add_member(user.username)
         end
 
         expect(page).to have_content(/@#{user.username}(\n| )?Given access/)