diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-30 21:09:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-30 21:09:13 +0300 |
| commit | 79040c61789cf767f8a232b1b9ecc0dc557d76cb (patch) | |
| tree | dc7af3a9eca1d5503622b32a0783a0cba8f94c76 /spec/services/auto_merge | |
| parent | 340f15b402eec795fca0e0f29709baef0ecf14a7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/auto_merge')
| -rw-r--r-- | spec/services/auto_merge/base_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/auto_merge/base_service_spec.rb b/spec/services/auto_merge/base_service_spec.rb index 9673a65344d..98fa6012089 100644 --- a/spec/services/auto_merge/base_service_spec.rb +++ b/spec/services/auto_merge/base_service_spec.rb @@ -51,7 +51,7 @@ RSpec.describe AutoMerge::BaseService do expect(merge_request.merge_params['commit_message']).to eq("Merge branch 'patch-12' into 'master'") expect(merge_request.merge_params['sha']).to eq('200fcc9c260f7219eaf0daba87d818f0922c5b18') expect(merge_request.merge_params['should_remove_source_branch']).to eq(false) - expect(merge_request.squash).to eq(false) + expect(merge_request.squash_on_merge?).to eq(false) expect(merge_request.merge_params['squash_commit_message']).to eq('Update README.md') end end |