summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index f84f922ba5e..1c5dbda0de2 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -334,9 +334,9 @@ describe Projects::MergeRequestsController do
it 'sets the MR to merge when the build succeeds' do
service = double(:merge_when_build_succeeds_service)
- expect(MergeRequests::MergeWhenPipelineSucceedsService)
- .to receive(:new).with(project, anything, anything)
- .and_return(service)
+ expect(MergeRequests::MergeWhenPipelineSucceedsService).
+ to receive(:new).with(project, anything, anything).
+ and_return(service)
expect(service).to receive(:execute).with(merge_request)
merge_when_build_succeeds