Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/factories/ci/pipelines.rb')
-rw-r--r--spec/factories/ci/pipelines.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index 87b9a6c0e23..4fc7d945881 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -81,6 +81,10 @@ FactoryBot.define do
status { :failed }
end
+ trait :unlocked do
+ locked { Ci::Pipeline.lockeds[:unlocked] }
+ end
+
trait :protected do
add_attribute(:protected) { true }
end
@@ -237,7 +241,7 @@ FactoryBot.define do
trait :merged_result_pipeline do
detached_merge_request_pipeline
- sha { 'test-merge-sha'}
+ sha { 'mergeSha' }
ref { merge_request.merge_ref_path }
source_sha { merge_request.source_branch_sha }
target_sha { merge_request.target_branch_sha }