Merge branch '323421-qe-fix-merge-trains-spec' into 'master'

Expand merge request settings in the failing E2E spec See merge request gitlab-org/gitlab!55743

Merge branch '323421-qe-fix-merge-trains-spec' into 'master'
Expand merge request settings in the failing E2E spec See merge request gitlab-org/gitlab!55743
1cd9ee31 · Dan Davison · 333033ab · e15d681a · 1cd9ee31
Commit 1cd9ee31 authored Mar 04, 2021 by Dan Davison
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

qa/qa/specs/features/ee/browser_ui/4_verify/new_discussion_not_dropping_merge_trains_mr_spec.rb ...erify/new_discussion_not_dropping_merge_trains_mr_spec.rb +2 -5

No files found.
--- a/qa/qa/specs/features/ee/browser_ui/4_verify/new_discussion_not_dropping_merge_trains_mr_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/4_verify/new_discussion_not_dropping_merge_trains_mr_spec.rb
@@ -35,12 +35,9 @@ module QA
          Flow::Login.sign_in
          project.visit!
-          Page::Project::Menu.perform(&:go_to_general_settings)
+          Flow::MergeRequest.enable_merge_trains
          Page::Project::Settings::Main.perform(&:expand_merge_requests_settings)
-          Page::Project::Settings::MergeRequest.perform do |setting|
+          Page::Project::Settings::MergeRequest.perform(&:enable_merge_if_all_disscussions_are_resolved)
-            setting.enable_merge_train
-            setting.enable_merge_if_all_disscussions_are_resolved
-          end
          commit_ci_file