diff options
Diffstat (limited to 'qa/qa/page/project/settings')
| -rw-r--r-- | qa/qa/page/project/settings/main.rb | 7 | ||||
| -rw-r--r-- | qa/qa/page/project/settings/merge_request.rb | 13 |
2 files changed, 15 insertions, 5 deletions
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") |