diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-17 10:29:42 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-17 10:29:42 +0100 |
| commit | 35d280450260bad53022b6022ece7d31b5f4bd1f (patch) | |
| tree | 1a82a4ed9a5041bd35cdc1dacb4473b30fdbc98d /spec/factories | |
| parent | cb197ceb8031acb324510ce124a280caf2649442 (diff) | |
| parent | a56611e3892b9039f6a8196c37d8b70a3c86c68b (diff) | |
| download | gitlab-ce-35d280450260bad53022b6022ece7d31b5f4bd1f.tar.gz | |
Merge branch 'master' into ide-staged-changes
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/award_emoji.rb | 4 | ||||
| -rw-r--r-- | spec/factories/ci/builds.rb | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/spec/factories/award_emoji.rb b/spec/factories/award_emoji.rb index a0abbbce686..d37e2bf511e 100644 --- a/spec/factories/award_emoji.rb +++ b/spec/factories/award_emoji.rb @@ -4,6 +4,10 @@ FactoryBot.define do user awardable factory: :issue + after(:create) do |award, evaluator| + award.awardable.project.add_guest(evaluator.user) + end + trait :upvote trait :downvote do name "thumbsdown" diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index fdacbe6c3f1..e1fafa71d5c 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -62,7 +62,6 @@ FactoryBot.define do end trait :pending do - queued_at 'Di 29. Okt 09:50:59 CET 2013' status 'pending' end @@ -207,7 +206,7 @@ FactoryBot.define do options do { image: { name: 'ruby:2.1', entrypoint: '/bin/sh' }, - services: ['postgres', { name: 'docker:dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }], + services: ['postgres', { name: 'docker:stable-dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }], after_script: %w(ls date), artifacts: { name: 'artifacts_file', |