diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-02-28 18:15:32 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-01 14:01:11 +0900 |
| commit | adf003a9312fddfb5438775c3cf24b052c616b4f (patch) | |
| tree | 3e6dfb24e8490b93141f1399a45dc46b89407fa2 /spec/factories | |
| parent | c994484d17d6a6da929f6a52f1b64dc15c38835c (diff) | |
| download | gitlab-ce-adf003a9312fddfb5438775c3cf24b052c616b4f.tar.gz | |
Fix inconsistent `branch?` behavior
between Ci::Pipeline and Ci::Build
Add spec
Add more tests
ok
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/merge_requests.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index 2392bfc4a53..0c0c5fc8a4c 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -101,6 +101,15 @@ FactoryBot.define do end end + trait :with_merge_request_pipeline do + after(:build) do |merge_request| + merge_request.merge_request_pipelines << build(:ci_pipeline, + source: :merge_request, + merge_request: merge_request, + project: merge_request.source_project) + end + end + trait :deployed_review_app do target_branch 'pages-deploy-target' |