diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-08-28 17:29:28 +0300 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-09-04 15:55:26 +0300 |
commit | cff104ec4b0dd2c53ed907ab7ca423b7c587dee8 (patch) | |
tree | cbe9d1b41351f79a1370725ce13f2fdc4af30cd4 /spec/factories | |
parent | acc7497855167d4f6ba481422112645a1a04a885 (diff) |
Fix spec
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/ci/builds.rb | 2 | ||||
-rw-r--r-- | spec/factories/ci/trigger_requests.rb | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index 592df038aa3..25ec63de94a 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -107,7 +107,7 @@ FactoryGirl.define do end trait :triggered do - trigger_request factory: :ci_trigger_request_with_variables # TODO: + trigger_request factory: :ci_trigger_request_with_variables end after(:build) do |build, evaluator| diff --git a/spec/factories/ci/trigger_requests.rb b/spec/factories/ci/trigger_requests.rb index 10e0ab4fd3c..72dad8c418c 100644 --- a/spec/factories/ci/trigger_requests.rb +++ b/spec/factories/ci/trigger_requests.rb @@ -2,12 +2,11 @@ FactoryGirl.define do factory :ci_trigger_request, class: Ci::TriggerRequest do trigger factory: :ci_trigger + # We switched to Ci::PipelineVariable from Ci::TriggerRequest.variables. + # Ci::TriggerRequest doesn't save variables anymore, whereas old trigger requests still persist variables. factory :ci_trigger_request_with_variables do - variables do - { - TRIGGER_KEY_1: 'TRIGGER_VALUE_1', - TRIGGER_KEY_2: 'TRIGGER_VALUE_2' - } + after(:create) do |trigger_request, evaluator| + trigger_request.update_attribute(:variables, { TRIGGER_KEY_1: 'TRIGGER_VALUE_1', TRIGGER_KEY_2: 'TRIGGER_VALUE_2' } ) end end end |