diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-27 14:04:43 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 10:22:09 +0100 |
| commit | 01f238893aaf8f5aa24eec7e33edc479d4e1315d (patch) | |
| tree | 2a70dc5268343ad50a0d5bdff47853bf3a82482b /spec/controllers/projects | |
| parent | 900999f8180e49aa1677286e3e0cfa08d47829a7 (diff) | |
| download | gitlab-ce-01f238893aaf8f5aa24eec7e33edc479d4e1315d.tar.gz | |
Rename MWBS service to Merge When Pipeline Succeeds
Diffstat (limited to 'spec/controllers/projects')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 1d0750d1719..9e0b80205d8 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -292,7 +292,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::MergeWhenBuildSucceedsService).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 |