diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 21:06:29 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 21:06:29 +0000 |
commit | b9254657872c4db441ab268154686f5476fb4bc6 (patch) | |
tree | ab045c623296a049d1246ba2d66800456a1077aa /qa | |
parent | c792263edfaf826c58f4aa41d26904464a17a3e7 (diff) | |
download | gitlab-ce-b9254657872c4db441ab268154686f5476fb4bc6.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/merge_request/show.rb | 21 | ||||
-rw-r--r-- | qa/qa/page/project/settings/main.rb | 7 | ||||
-rw-r--r-- | qa/qa/page/project/settings/merge_request.rb | 13 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb | 8 |
4 files changed, 36 insertions, 13 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index 6e550805f9f..ea0cbfe2ab0 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -6,6 +6,16 @@ module QA class Show < Page::Base include Page::Component::Note + view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue' do + element :dropdown_toggle + element :download_email_patches + element :download_plain_diff + end + + view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue' do + element :merge_request_pipeline_info_content + end + view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do element :merge_button element :fast_forward_message, 'Fast-forward merge without a merge commit' # rubocop:disable QA/ElementWithPattern @@ -27,12 +37,6 @@ module QA element :squash_checkbox end - view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue' do - element :dropdown_toggle - element :download_email_patches - element :download_plain_diff - end - view 'app/views/projects/merge_requests/show.html.haml' do element :notes_tab element :diffs_tab @@ -111,6 +115,11 @@ module QA end end + def has_pipeline_status?(text) + # Pipelines can be slow, so we wait a bit longer than the usual 10 seconds + has_element?(:merge_request_pipeline_info_content, text: text, wait: 30) + end + def has_title?(title) has_element?(:title, text: title) end diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb index 6b26c82a46f..3a60330217b 100644 --- a/qa/qa/page/project/settings/main.rb +++ b/qa/qa/page/project/settings/main.rb @@ -11,6 +11,7 @@ module QA view 'app/views/projects/edit.html.haml' do element :advanced_settings + element :merge_request_settings end view 'app/views/projects/settings/_general.html.haml' do @@ -41,6 +42,12 @@ module QA end end + def expand_merge_requests_settings(&block) + expand_section(:merge_request_settings) do + MergeRequest.perform(&block) + end + end + def expand_visibility_project_features_permissions(&block) expand_section(:visibility_features_permissions_content) do VisibilityFeaturesPermissions.perform(&block) diff --git a/qa/qa/page/project/settings/merge_request.rb b/qa/qa/page/project/settings/merge_request.rb index f92528c4262..7da2c9d168c 100644 --- a/qa/qa/page/project/settings/merge_request.rb +++ b/qa/qa/page/project/settings/merge_request.rb @@ -8,7 +8,6 @@ module QA include Common view 'app/views/projects/edit.html.haml' do - element :merge_request_settings element :save_merge_request_changes end @@ -16,14 +15,18 @@ module QA element :radio_button_merge_ff end + def click_save_changes + click_element :save_merge_request_changes + end + def enable_ff_only - expand_section(:merge_request_settings) do - click_element :radio_button_merge_ff - click_element :save_merge_request_changes - end + click_element :radio_button_merge_ff + click_save_changes end end end end end end + +QA::Page::Project::Settings::MergeRequest.prepend_if_ee("QA::EE::Page::Project::Settings::MergeRequest") 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 3ce291bf8bc..c7b5e40d0be 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 @@ -13,8 +13,12 @@ module QA end project.visit! - Page::Project::Menu.perform(&:click_settings) - Page::Project::Settings::MergeRequest.perform(&:enable_ff_only) + Page::Project::Menu.perform(&:go_to_general_settings) + Page::Project::Settings::Main.perform do |main| + main.expand_merge_requests_settings do |settings| + settings.enable_ff_only + end + end merge_request = Resource::MergeRequest.fabricate! do |merge_request| merge_request.project = project |