diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-05 04:13:06 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-10-05 04:13:06 +0300 |
| commit | af2c51d7ca73e16cdb9a11fff6d097116c7c5324 (patch) | |
| tree | cd7f07f36e09a357902a262cbb932f25d254a16c /spec/factories/clusters | |
| parent | acfe7ec65c75f65f2f87bf3e8598c1725c9150f4 (diff) | |
| parent | f71c497f5da791a35876206255e342a9bb5e49c5 (diff) | |
Merge branch 'master-ce' into scheduled-manual-jobs
Diffstat (limited to 'spec/factories/clusters')
| -rw-r--r-- | spec/factories/clusters/applications/helm.rb | 2 | ||||
| -rw-r--r-- | spec/factories/clusters/platforms/kubernetes.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb index 5756486df27..3c9ca22a051 100644 --- a/spec/factories/clusters/applications/helm.rb +++ b/spec/factories/clusters/applications/helm.rb @@ -42,7 +42,7 @@ FactoryBot.define do trait :timeouted do installing - updated_at ClusterWaitForAppInstallationWorker::TIMEOUT.ago + updated_at { ClusterWaitForAppInstallationWorker::TIMEOUT.ago } end factory :clusters_applications_ingress, class: Clusters::Applications::Ingress do diff --git a/spec/factories/clusters/platforms/kubernetes.rb b/spec/factories/clusters/platforms/kubernetes.rb index 36ac2372204..4a0d1b181ea 100644 --- a/spec/factories/clusters/platforms/kubernetes.rb +++ b/spec/factories/clusters/platforms/kubernetes.rb @@ -3,11 +3,10 @@ FactoryBot.define do cluster namespace nil api_url 'https://kubernetes.example.com' - token 'a' * 40 + token { 'a' * 40 } trait :configured do api_url 'https://kubernetes.example.com' - token 'a' * 40 username 'xxxxxx' password 'xxxxxx' |