diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 12:06:18 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 12:06:18 +0000 |
commit | 6a4ffad42050949fcf08e78147575734ae99627e (patch) | |
tree | 723bb2480948ba4ec29ca9ac10f8728dc2a831b6 /spec/services/merge_requests/push_options_handler_service_spec.rb | |
parent | 23d237110e6a646dec08e1f5b4696d2d9c51cfef (diff) | |
download | gitlab-ce-6a4ffad42050949fcf08e78147575734ae99627e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests/push_options_handler_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/push_options_handler_service_spec.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/spec/services/merge_requests/push_options_handler_service_spec.rb b/spec/services/merge_requests/push_options_handler_service_spec.rb index 75b9c2304a6..7f9c47d8670 100644 --- a/spec/services/merge_requests/push_options_handler_service_spec.rb +++ b/spec/services/merge_requests/push_options_handler_service_spec.rb @@ -101,17 +101,15 @@ describe MergeRequests::PushOptionsHandlerService do shared_examples_for 'a service that can set the merge request to merge when pipeline succeeds' do subject(:last_mr) { MergeRequest.last } + let(:change) { Gitlab::ChangesList.new(changes).changes.first } + it 'sets auto_merge_enabled' do service.execute expect(last_mr.auto_merge_enabled).to eq(true) expect(last_mr.auto_merge_strategy).to eq(AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS) - end - - it 'sets merge_user to the user' do - service.execute - expect(last_mr.merge_user).to eq(user) + expect(last_mr.merge_params['sha']).to eq(change[:newrev]) end end |