diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:59 +0300 |
| commit | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (patch) | |
| tree | 651b5fca7ea0460e3ce7c687cfa9e3a3b37eefc8 /spec/services/merge_requests | |
| parent | b4ded0ba7b4d2cdbed5b1f331cf2083a25ee4d7c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index fa1a8f60256..496b08799f2 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -31,6 +31,11 @@ describe MergeRequests::MergeService do it { expect(merge_request).to be_valid } it { expect(merge_request).to be_merged } + it 'persists merge_commit_sha and nullifies in_progress_merge_commit_sha' do + expect(merge_request.merge_commit_sha).not_to be_nil + expect(merge_request.in_progress_merge_commit_sha).to be_nil + end + it 'sends email to user2 about merge of new merge_request' do email = ActionMailer::Base.deliveries.last expect(email.to.first).to eq(user2.email) |