diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-21 17:29:35 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:31:56 -0600 |
| commit | 3dadf306ddc81183e74b048bc4119796852ed7ea (patch) | |
| tree | f01d5e7eb9c5550bc34a42d9e88479cd3fef578d /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | 547063b3ac096dff25309b6e0846b0d5f417c128 (diff) | |
| download | gitlab-ce-3dadf306ddc81183e74b048bc4119796852ed7ea.tar.gz | |
Enable Style/DotPosition
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 6 |
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 |