diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-05-30 13:18:04 -0300 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-05-31 14:37:40 +0200 |
| commit | 23e4ad528743290c31b8af22e97917c0539a6008 (patch) | |
| tree | b570c450bc4e577aba7c78a431ce34dc1c7fe388 /spec/controllers | |
| parent | da9cc1b91fa34dc91e797fba38f23cfc53e50a09 (diff) | |
| download | gitlab-ce-23e4ad528743290c31b8af22e97917c0539a6008.tar.gz | |
Adjust permitted params filtering on merge scheduling
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 5efaaf2bb3a..6e8de6db9c3 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -326,8 +326,8 @@ describe Projects::MergeRequestsController do expect(json_response).to eq('status' => 'success') end - it 'starts the merge immediately' do - expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, anything) + it 'starts the merge immediately with permitted params' do + expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, { 'squash' => false }) merge_with_sha end |