summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-03-07 14:33:13 +0700
committerShinya Maeda <shinya@gitlab.com>2019-03-13 21:36:27 +0700
commit05c0377008438025a7e3396effefc197f6bf2a97 (patch)
treeb92e8ecac3bcbc41f3be87c0629eedacd45e8c46 /spec/factories
parent69ed9ae4d4bc0a64713c9a01d6ac27f9fc303101 (diff)
downloadgitlab-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/factories')
-rw-r--r--spec/factories/merge_requests.rb23
1 files changed, 21 insertions, 2 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index ecd7ea65fb7..a73f330a7a9 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -101,17 +101,36 @@ FactoryBot.define do
end
end
- trait :with_merge_request_pipeline do
+ trait :with_detached_merge_request_pipeline do
after(:build) do |merge_request|
merge_request.merge_request_pipelines << build(:ci_pipeline,
source: :merge_request_event,
merge_request: merge_request,
project: merge_request.source_project,
- ref: merge_request.source_branch,
+ ref: merge_request.ref_path,
sha: merge_request.source_branch_sha)
end
end
+ trait :with_merge_request_pipeline do
+ transient do
+ merge_sha { 'test-merge-sha' }
+ source_sha { source_branch_sha }
+ target_sha { target_branch_sha }
+ end
+
+ after(:build) do |merge_request, evaluator|
+ merge_request.merge_request_pipelines << create(:ci_pipeline,
+ source: :merge_request_event,
+ merge_request: merge_request,
+ project: merge_request.source_project,
+ ref: merge_request.merge_ref_path,
+ sha: evaluator.merge_sha,
+ source_sha: evaluator.source_sha,
+ target_sha: evaluator.target_sha)
+ end
+ end
+
trait :deployed_review_app do
target_branch 'pages-deploy-target'