Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 5 deletions

diff --git a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb
index 8c4dbf5ebfd..f92fbbc0caa 100644
--- a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb
@@ -34,6 +34,16 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
     sign_in(user)
   end
 
+  # rubocop:disable RSpec/AvoidConditionalStatements
+  def mr_widget_title
+    if Gitlab.ee?
+      'to be merged automatically when all merge checks pass'
+    else
+      'to be merged automatically when the pipeline succeeds'
+    end
+  end
+  # rubocop:enable RSpec/AvoidConditionalStatements
+
   context 'when a user created a merge request in the parent project' do
     let!(:merge_request) do
       create(
@@ -163,7 +173,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
 
         context 'when detached merge request pipeline is pending' do
           it 'waits the head pipeline' do
-            expect(page).to have_content('to be merged automatically when the pipeline succeeds')
+            expect(page).to have_content mr_widget_title
             expect(page).to have_button('Cancel auto-merge')
           end
         end
@@ -177,7 +187,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
           end
 
           it 'waits the head pipeline' do
-            expect(page).to have_content('to be merged automatically when the pipeline succeeds')
+            expect(page).to have_content mr_widget_title
             expect(page).to have_button('Cancel auto-merge')
           end
         end
@@ -388,7 +398,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
 
       context 'when detached merge request pipeline is pending' do
         it 'waits the head pipeline' do
-          expect(page).to have_content('to be merged automatically when the pipeline succeeds')
+          expect(page).to have_content mr_widget_title
           expect(page).to have_button('Cancel auto-merge')
         end
       end
@@ -397,7 +407,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
         before do
           detached_merge_request_pipeline.reload.succeed!
 
-          wait_for_requests
+          refresh
         end
 
         it 'merges the merge request' do
@@ -414,7 +424,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
         end
 
         it 'waits the head pipeline' do
-          expect(page).to have_content('to be merged automatically when the pipeline succeeds')
+          expect(page).to have_content mr_widget_title
           expect(page).to have_button('Cancel auto-merge')
         end
       end