From 40d3d574132d2849646c20eb9d8742b159d9bfc8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 13 Sep 2019 18:06:03 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb | 2 +- .../browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb | 2 +- .../features/browser_ui/1_manage/project/add_project_member_spec.rb | 2 +- .../features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb | 2 +- .../features/browser_ui/3_create/repository/add_file_template_spec.rb | 2 +- .../browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb | 2 +- .../features/browser_ui/3_create/web_ide/add_file_template_spec.rb | 2 +- .../browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb | 2 +- qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'qa/qa/specs') 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 -- cgit v1.2.1