diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-09 13:56:26 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-09 13:56:26 +0100 |
commit | 73c59de0621010681197ebe7bfaed7f3eb03050d (patch) | |
tree | f84dcde56073325ea98116f04e0f3710913291e3 /spec/services/merge_requests/merge_service_spec.rb | |
parent | 6c6fb1d8bb2c6aa44553ebf35496d64ff6b202d2 (diff) | |
parent | 9bfd6c44e23754b6f699586f6a0cec2879e107e0 (diff) | |
download | gitlab-ce-73c59de0621010681197ebe7bfaed7f3eb03050d.tar.gz |
Merge branch 'master' into split-up-builds
Diffstat (limited to 'spec/services/merge_requests/merge_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index f2160567f0a..ceb3f97280e 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -13,12 +13,13 @@ describe MergeRequests::MergeService, services: true do describe :execute do context 'valid params' do - let(:service) { MergeRequests::MergeService.new(project, user, {}) } + let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') } before do allow(service).to receive(:execute_hooks) + perform_enqueued_jobs do - service.execute(merge_request, 'Awesome message') + service.execute(merge_request) end end @@ -38,14 +39,14 @@ describe MergeRequests::MergeService, services: true do end context "error handling" do - let(:service) { MergeRequests::MergeService.new(project, user, {}) } + let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') } it 'saves error if there is an exception' do allow(service).to receive(:repository).and_raise("error") allow(service).to receive(:execute_hooks) - service.execute(merge_request, 'Awesome message') + service.execute(merge_request) expect(merge_request.merge_error).to eq("Something went wrong during merge") end |