From 6e81d7f6283fae1b22f66b9d9b133243921cbd9e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 15 Nov 2019 15:06:12 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/controllers/projects/merge_requests_controller_spec.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb') diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index e49c0f60eeb..9f7fde2f0da 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -405,7 +405,7 @@ describe Projects::MergeRequestsController do end it 'starts the merge immediately with permitted params' do - expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, { 'squash' => false }) + expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, { 'sha' => merge_request.diff_head_sha }) merge_with_sha end @@ -432,9 +432,14 @@ describe Projects::MergeRequestsController do let(:message) { 'My custom squash commit message' } it 'passes the same message to SquashService', :sidekiq_might_not_need_inline do - params = { squash: '1', squash_commit_message: message } - - expect_next_instance_of(MergeRequests::SquashService, project, user, params.merge(merge_request: merge_request)) do |squash_service| + params = { squash: '1', + squash_commit_message: message, + sha: merge_request.diff_head_sha } + expected_squash_params = { squash_commit_message: message, + sha: merge_request.diff_head_sha, + merge_request: merge_request } + + expect_next_instance_of(MergeRequests::SquashService, project, user, expected_squash_params) do |squash_service| expect(squash_service).to receive(:execute).and_return({ status: :success, squash_sha: SecureRandom.hex(20) -- cgit v1.2.1