diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-07 14:33:13 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-13 21:36:27 +0700 |
| commit | 05c0377008438025a7e3396effefc197f6bf2a97 (patch) | |
| tree | b92e8ecac3bcbc41f3be87c0629eedacd45e8c46 /spec/models/ci/build_spec.rb | |
| parent | 69ed9ae4d4bc0a64713c9a01d6ac27f9fc303101 (diff) | |
| download | gitlab-ce-05c0377008438025a7e3396effefc197f6bf2a97.tar.gz | |
Add attached flag to pipeline entity
Add spec
Fix
Fix
Add changelog
Drop attached
Remove attached
Update changelog
ok
Diffstat (limited to 'spec/models/ci/build_spec.rb')
| -rw-r--r-- | spec/models/ci/build_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index dd40b968bc1..9ca4241d7d8 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -2772,7 +2772,7 @@ describe Ci::Build do end context 'when ref is merge request' do - let(:merge_request) { create(:merge_request, :with_merge_request_pipeline) } + let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) } let(:pipeline) { merge_request.merge_request_pipelines.first } let(:build) { create(:ci_build, ref: merge_request.source_branch, tag: false, pipeline: pipeline, project: project) } @@ -2830,7 +2830,7 @@ describe Ci::Build do end context 'when ref is merge request' do - let(:merge_request) { create(:merge_request, :with_merge_request_pipeline) } + let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) } let(:pipeline) { merge_request.merge_request_pipelines.first } let(:build) { create(:ci_build, ref: merge_request.source_branch, tag: false, pipeline: pipeline, project: project) } |