diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 15:06:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 15:06:12 +0000 |
| commit | 6e81d7f6283fae1b22f66b9d9b133243921cbd9e (patch) | |
| tree | 8cf8052ef6734ceeb49314f15ff07d2720511f0d /spec/workers | |
| parent | 3fc9a8e6957ddf75576dc63069c4c0249514499f (diff) | |
| download | gitlab-ce-6e81d7f6283fae1b22f66b9d9b133243921cbd9e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
| -rw-r--r-- | spec/workers/merge_worker_spec.rb | 1 | ||||
| -rw-r--r-- | spec/workers/process_commit_worker_spec.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/workers/merge_worker_spec.rb b/spec/workers/merge_worker_spec.rb index 138a99abde6..dc98c9836fa 100644 --- a/spec/workers/merge_worker_spec.rb +++ b/spec/workers/merge_worker_spec.rb @@ -20,6 +20,7 @@ describe MergeWorker do described_class.new.perform( merge_request.id, merge_request.author_id, commit_message: 'wow such merge', + sha: merge_request.diff_head_sha, should_remove_source_branch: true) merge_request.reload diff --git a/spec/workers/process_commit_worker_spec.rb b/spec/workers/process_commit_worker_spec.rb index eb1d3c364ac..99800135075 100644 --- a/spec/workers/process_commit_worker_spec.rb +++ b/spec/workers/process_commit_worker_spec.rb @@ -81,9 +81,10 @@ describe ProcessCommitWorker do let(:commit) do project.repository.create_branch('feature-merged', 'feature') + project.repository.after_create_branch MergeRequests::MergeService - .new(project, merge_request.author) + .new(project, merge_request.author, { sha: merge_request.diff_head_sha }) .execute(merge_request) merge_request.reload.merge_commit |