diff options
| author | twonegatives <whitewhiteheaven@gmail.com> | 2016-12-13 00:55:33 +0300 |
|---|---|---|
| committer | twonegatives <whitewhiteheaven@gmail.com> | 2016-12-16 21:16:24 +0300 |
| commit | f14228f0f2f69a967c483e4aa4ef1568e5fdc49b (patch) | |
| tree | 3654c8605a91e5a6b1d6aad5ddd94ea9a6ce97bc /spec/services/todo_service_spec.rb | |
| parent | b1120fc3e702daac001d000263eac79f4629b595 (diff) | |
| download | gitlab-ce-f14228f0f2f69a967c483e4aa4ef1568e5fdc49b.tar.gz | |
Notify the user who set auto-merge when a build fails
Diffstat (limited to 'spec/services/todo_service_spec.rb')
| -rw-r--r-- | spec/services/todo_service_spec.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb index ed55791d24e..d8a9ca20b36 100644 --- a/spec/services/todo_service_spec.rb +++ b/spec/services/todo_service_spec.rb @@ -469,6 +469,13 @@ describe TodoService, services: true do should_create_todo(user: author, target: mr_unassigned, action: Todo::BUILD_FAILED) end + + it 'creates a pending todo for merge_user' do + mr_unassigned.update(merge_when_build_succeeds: true, merge_user: admin) + service.merge_request_build_failed(mr_unassigned) + + should_create_todo(user: admin, author: admin, target: mr_unassigned, action: Todo::BUILD_FAILED) + end end describe '#merge_request_push' do |