diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 15:16:31 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 15:16:31 +0000 |
| commit | a3607aa43971d03b718e070db271104553eca549 (patch) | |
| tree | 5c08f9b44e263c2878cba496e088b04a93816788 /spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb | |
| parent | a325a50a0369b036164a52b5449dc696ca75fdd9 (diff) | |
| parent | 2ccee7161a58ea04c66b216ccb57e522850f5d95 (diff) | |
| download | gitlab-ce-a3607aa43971d03b718e070db271104553eca549.tar.gz | |
Merge branch 'issue_27168_2' into 'master'
Preloads head pipeline for each merge request
Closes #27168
See merge request !10064
Diffstat (limited to 'spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb index b33d7f90a31..11b6f0c0a64 100644 --- a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb +++ b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb @@ -16,7 +16,10 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do ref: merge_request.source_branch) end - before { project.team << [user, :master] } + before do + project.add_master(user) + merge_request.update(head_pipeline_id: pipeline.id) + end context 'when there is active pipeline for merge request' do background do |