diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-09 15:56:26 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-09 15:56:26 +0300 |
commit | 73c59de0621010681197ebe7bfaed7f3eb03050d (patch) | |
tree | f84dcde56073325ea98116f04e0f3710913291e3 /spec/services/merge_requests/refresh_service_spec.rb | |
parent | 6c6fb1d8bb2c6aa44553ebf35496d64ff6b202d2 (diff) | |
parent | 9bfd6c44e23754b6f699586f6a0cec2879e107e0 (diff) |
Merge branch 'master' into split-up-builds
Diffstat (limited to 'spec/services/merge_requests/refresh_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index b892f44af03..450250ba032 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -17,7 +17,9 @@ describe MergeRequests::RefreshService, services: true do source_project: @project, source_branch: 'master', target_branch: 'feature', - target_project: @project) + target_project: @project, + merge_when_build_succeeds: true, + merge_user: @user) @fork_merge_request = create(:merge_request, source_project: @fork_project, @@ -46,6 +48,7 @@ describe MergeRequests::RefreshService, services: true do it { expect(@merge_request.notes).not_to be_empty } it { expect(@merge_request).to be_open } + it { expect(@merge_request.merge_when_build_succeeds).to be_falsey} it { expect(@fork_merge_request).to be_open } it { expect(@fork_merge_request.notes).to be_empty } end @@ -146,6 +149,7 @@ describe MergeRequests::RefreshService, services: true do end end + def reload_mrs @merge_request.reload @fork_merge_request.reload |