diff options
author | Phil Hughes <me@iamphill.com> | 2018-06-01 12:12:18 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-01 12:12:18 +0100 |
commit | 9ffb60acd8ab646eabfa32e6faaa3802c2aef2a6 (patch) | |
tree | 71322166368986c869e5607ec9f2f1066d0c4e3e /spec/factories | |
parent | 8868c919a3c798f7d5753e250723df6d285de7b0 (diff) | |
parent | e206e32881e4fbfcbe647d7b2ee713c99ef1bf99 (diff) | |
download | gitlab-ce-9ffb60acd8ab646eabfa32e6faaa3802c2aef2a6.tar.gz |
Merge branch 'master' into ide-list-merge-requests
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/clusters/applications/helm.rb | 3 | ||||
-rw-r--r-- | spec/factories/users.rb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb index 3deca103578..3e4277e4ba6 100644 --- a/spec/factories/clusters/applications/helm.rb +++ b/spec/factories/clusters/applications/helm.rb @@ -35,5 +35,8 @@ FactoryBot.define do factory :clusters_applications_ingress, class: Clusters::Applications::Ingress factory :clusters_applications_prometheus, class: Clusters::Applications::Prometheus factory :clusters_applications_runner, class: Clusters::Applications::Runner + factory :clusters_applications_jupyter, class: Clusters::Applications::Jupyter do + oauth_application factory: :oauth_application + end end end diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 769fd656e7a..59db8cdc34b 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -12,10 +12,6 @@ FactoryBot.define do user.notification_email = user.email end - before(:create) do |user| - user.ensure_rss_token - end - trait :admin do admin true end |