diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-07-07 10:12:13 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-07 10:12:13 +0300 |
| commit | 08fba1327fa5d2b123155b647e2ac963f9d76bb3 (patch) | |
| tree | 538b1356bbda6358a40a7bf9b7a68813f44d1275 /spec/factories/ci | |
| parent | f8391bd782ef9a19b6c8595331ada49721bd89be (diff) | |
| parent | 49430c47d4d34072ff43cc1e35213317802055d7 (diff) | |
merge from master
Diffstat (limited to 'spec/factories/ci')
| -rw-r--r-- | spec/factories/ci/builds.rb | 3 | ||||
| -rw-r--r-- | spec/factories/ci/runner_projects.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index 0cc498f0ce9..a77f01ecb00 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -207,7 +207,8 @@ FactoryGirl.define do cache: { key: 'cache_key', untracked: false, - paths: ['vendor/*'] + paths: ['vendor/*'], + policy: 'pull-push' } } end diff --git a/spec/factories/ci/runner_projects.rb b/spec/factories/ci/runner_projects.rb index 6712dd5d82e..33a17cf7ed5 100644 --- a/spec/factories/ci/runner_projects.rb +++ b/spec/factories/ci/runner_projects.rb @@ -1,6 +1,6 @@ FactoryGirl.define do factory :ci_runner_project, class: Ci::RunnerProject do - runner_id 1 - project_id 1 + runner factory: :ci_runner + project factory: :empty_project end end |