Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

14 files changed, 20 insertions, 18 deletions

diff --git a/spec/features/merge_request/batch_comments_spec.rb b/spec/features/merge_request/batch_comments_spec.rb
index 19680a827bf..5b11d9cb919 100644
--- a/spec/features/merge_request/batch_comments_spec.rb
+++ b/spec/features/merge_request/batch_comments_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe 'Merge request > Batch comments', :js do
 
       expect(page).to have_css('.review-bar-component')
 
-      expect(find('.review-bar-content .btn-success')).to have_content('1')
+      expect(find('.review-bar-content .btn-confirm')).to have_content('1')
     end
 
     it 'publishes review' do
@@ -157,7 +157,7 @@ RSpec.describe 'Merge request > Batch comments', :js do
         expect(find('.new .draft-note-component')).to have_content('Line is wrong')
         expect(find('.old .draft-note-component')).to have_content('Another wrong line')
 
-        expect(find('.review-bar-content .btn-success')).to have_content('2')
+        expect(find('.review-bar-content .btn-confirm')).to have_content('2')
       end
     end
 
diff --git a/spec/features/merge_request/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb
index 119cf31098c..617aceae54c 100644
--- a/spec/features/merge_request/user_creates_merge_request_spec.rb
+++ b/spec/features/merge_request/user_creates_merge_request_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe "User creates a merge request", :js do
 
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
+
   let(:title) { "Some feature" }
 
   before do
diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
index 63b463a2c5f..9e1b0135932 100644
--- a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
+++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
@@ -64,7 +64,7 @@ RSpec.describe 'Merge request > User merges when pipeline succeeds', :js do
       context 'when enabled after it was previously canceled' do
         before do
           click_button "Merge when pipeline succeeds"
-          click_link "Cancel automatic merge"
+          click_link "Cancel"
 
           wait_for_requests
 
@@ -87,7 +87,7 @@ RSpec.describe 'Merge request > User merges when pipeline succeeds', :js do
         before do
           merge_request.merge_params['force_remove_source_branch'] = '0'
           merge_request.save!
-          click_link "Cancel automatic merge"
+          click_link "Cancel"
         end
 
         it_behaves_like 'Merge when pipeline succeeds activator'
@@ -114,7 +114,7 @@ RSpec.describe 'Merge request > User merges when pipeline succeeds', :js do
     end
 
     it 'allows to cancel the automatic merge' do
-      click_link "Cancel automatic merge"
+      click_link "Cancel"
 
       expect(page).to have_button "Merge when pipeline succeeds"
 
diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb
index a6dfae72912..83d9388914b 100644
--- a/spec/features/merge_request/user_posts_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_notes_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe 'Merge request > User posts notes', :js do
   include NoteInteractionHelpers
 
   let_it_be(:project) { create(:project, :repository) }
+
   let(:user) { project.creator }
   let(:merge_request) do
     create(:merge_request, source_project: project, target_project: project)
diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb
index 1b1152897fc..d9e3bfd6a9c 100644
--- a/spec/features/merge_request/user_resolves_conflicts_spec.rb
+++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb
@@ -173,7 +173,7 @@ RSpec.describe 'Merge request > User resolves conflicts', :js do
       end
 
       it "renders bad name without xss issues" do
-        expect(find('.resolve-conflicts-form .resolve-info')).to have_content(bad_branch_name)
+        expect(find('[data-testid="resolve-info"]')).to have_content(bad_branch_name)
       end
     end
   end
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
index 9a3f97a0943..73e628bda98 100644
--- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
+++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
@@ -131,7 +131,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do
             expect(page).not_to have_selector('.diffs .diff-file .notes_holder')
           end
 
-          it 'shows resolved thread when toggled' do
+          it 'shows resolved thread when toggled', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/327439' do
             find('.diff-comment-avatar-holders').click
 
             expect(find('.diffs .diff-file .notes_holder')).to be_visible
diff --git a/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb b/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb
index 78c1b2a718e..35be21a646e 100644
--- a/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb
+++ b/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Merge request > User cherry-picks', :js do
 
   context 'Viewing a merged merge request' do
     before do
-      service = MergeRequests::MergeService.new(project, user, sha: merge_request.diff_head_sha)
+      service = MergeRequests::MergeService.new(project: project, current_user: user, params: { sha: merge_request.diff_head_sha })
 
       perform_enqueued_jobs do
         service.execute(merge_request)
diff --git a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
index ac38b2b854c..e250837f398 100644
--- a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe 'Merge request > User sees merge button depending on unresolved t
     context 'with unresolved threads' do
       it 'does not allow to merge' do
         expect(page).not_to have_button 'Merge'
-        expect(page).to have_content('Before this can be merged,')
+        expect(page).to have_content('all threads must be resolved')
       end
     end
 
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 733b5a97fea..85eb956033b 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
@@ -147,7 +147,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_link('Cancel automatic merge')
+          expect(page).to have_link('Cancel')
         end
       end
 
@@ -174,7 +174,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
 
         it 'waits the head pipeline' do
           expect(page).to have_content('to be merged automatically when the pipeline succeeds')
-          expect(page).to have_link('Cancel automatic merge')
+          expect(page).to have_link('Cancel')
         end
       end
     end
@@ -369,7 +369,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_link('Cancel automatic merge')
+          expect(page).to have_link('Cancel')
         end
       end
 
@@ -395,7 +395,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
 
         it 'waits the head pipeline' do
           expect(page).to have_content('to be merged automatically when the pipeline succeeds')
-          expect(page).to have_link('Cancel automatic merge')
+          expect(page).to have_link('Cancel')
         end
       end
     end
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb
index 0cb4107c21d..d9b5ec17a4a 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -445,7 +445,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
       wait_for_requests
 
       expect(page).not_to have_button('Merge')
-      expect(page).to have_content('This merge request is in the process of being merged')
+      expect(page).to have_content('Merging!')
     end
   end
 
diff --git a/spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb b/spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb
index cbd68025b50..a764dd97878 100644
--- a/spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb
+++ b/spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Merge request > User sees MR from deleted forked project', :js d
   end
 
   before do
-    MergeRequests::MergeService.new(project, user).execute(merge_request)
+    MergeRequests::MergeService.new(project: project, current_user: user).execute(merge_request)
     forked_project.destroy!
     sign_in(user)
     visit project_merge_request_path(project, merge_request)
diff --git a/spec/features/merge_request/user_sees_pipelines_spec.rb b/spec/features/merge_request/user_sees_pipelines_spec.rb
index a5047c8d550..2d8fe10b987 100644
--- a/spec/features/merge_request/user_sees_pipelines_spec.rb
+++ b/spec/features/merge_request/user_sees_pipelines_spec.rb
@@ -239,7 +239,7 @@ RSpec.describe 'Merge request > User sees pipelines', :js do
 
         threads << Thread.new do
           Sidekiq::Worker.skipping_transaction_check do
-            @merge_request = MergeRequests::CreateService.new(project, user, merge_request_params).execute
+            @merge_request = MergeRequests::CreateService.new(project: project, current_user: user, params: merge_request_params).execute
           end
         end
 
diff --git a/spec/features/merge_request/user_sees_wip_help_message_spec.rb b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
index 204df5b3995..0a6a3d82ee0 100644
--- a/spec/features/merge_request/user_sees_wip_help_message_spec.rb
+++ b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe 'Merge request > User sees draft help message' do
           'It looks like you have some draft commits in this branch'
         )
         expect(page).to have_text(
-          "Start the title with Draft: or WIP: to prevent a merge request that is a \
+          "Start the title with Draft: to prevent a merge request that is a \
 work in progress from being merged before it's ready."
         )
       end
diff --git a/spec/features/merge_request/user_views_open_merge_request_spec.rb b/spec/features/merge_request/user_views_open_merge_request_spec.rb
index f1b44010f63..073706cf9d8 100644
--- a/spec/features/merge_request/user_views_open_merge_request_spec.rb
+++ b/spec/features/merge_request/user_views_open_merge_request_spec.rb
@@ -76,7 +76,7 @@ RSpec.describe 'User views an open merge request' do
 
       it 'does not show diverged commits count' do
         page.within('.mr-source-target') do
-          expect(page).not_to have_content(/([0-9]+ commit[s]? behind)/)
+          expect(page).not_to have_content(/([0-9]+ commits? behind)/)
         end
       end
     end