1 files changed, 32 insertions, 3 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 7c147419354..a751f785913 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -1269,6 +1269,7 @@ RSpec.describe API::MergeRequests do
         get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user)
 
         expect(json_response).to include('merged_by',
+          'merge_user',
           'merged_at',
           'closed_by',
           'closed_at',
@@ -1279,9 +1280,10 @@ RSpec.describe API::MergeRequests do
       end
 
       it 'returns correct values' do
-        get api("/projects/#{project.id}/merge_requests/#{merge_request.reload.iid}", user)
+        get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user)
 
         expect(json_response['merged_by']['id']).to eq(merge_request.metrics.merged_by_id)
+        expect(json_response['merge_user']['id']).to eq(merge_request.metrics.merged_by_id)
         expect(Time.parse(json_response['merged_at'])).to be_like_time(merge_request.metrics.merged_at)
         expect(json_response['closed_by']['id']).to eq(merge_request.metrics.latest_closed_by_id)
         expect(Time.parse(json_response['closed_at'])).to be_like_time(merge_request.metrics.latest_closed_at)
@@ -1292,6 +1294,32 @@ RSpec.describe API::MergeRequests do
       end
     end
 
+    context 'merge_user' do
+      context 'when MR is set to MWPS' do
+        let(:merge_request) { create(:merge_request, :merge_when_pipeline_succeeds, source_project: project, target_project: project) }
+
+        it 'returns user who set MWPS' do
+          get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user)
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response['merge_user']['id']).to eq(user.id)
+        end
+
+        context 'when MR is already merged' do
+          before do
+            merge_request.metrics.update!(merged_by: user2)
+          end
+
+          it 'returns user who actually merged' do
+            get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user)
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response['merge_user']['id']).to eq(user2.id)
+          end
+        end
+      end
+    end
+
     context 'head_pipeline' do
       let(:project) { create(:project, :repository) }
       let(:merge_request) { create(:merge_request, :simple, author: user, source_project: project, source_branch: 'markdown', title: "Test") }
@@ -3278,9 +3306,10 @@ RSpec.describe API::MergeRequests do
 
       context 'when skip_ci parameter is set' do
         it 'enqueues a rebase of the merge request with skip_ci flag set' do
-          allow(RebaseWorker).to receive(:with_status).and_return(RebaseWorker)
+          with_status = RebaseWorker.with_status
 
-          expect(RebaseWorker).to receive(:perform_async).with(merge_request.id, user.id, true).and_call_original
+          expect(RebaseWorker).to receive(:with_status).and_return(with_status)
+          expect(with_status).to receive(:perform_async).with(merge_request.id, user.id, true).and_call_original
 
           Sidekiq::Testing.fake! do
             expect do