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/qa/specs/features/browser_ui/3_create | |
| parent | c792263edfaf826c58f4aa41d26904464a17a3e7 (diff) | |
| download | gitlab-ce-b9254657872c4db441ab268154686f5476fb4bc6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/specs/features/browser_ui/3_create')
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb | 8 |
1 files changed, 6 insertions, 2 deletions
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 |