diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/factories/clusters | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/factories/clusters')
-rw-r--r-- | spec/factories/clusters/applications/helm.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb index 46aa640780b..01df5cc677d 100644 --- a/spec/factories/clusters/applications/helm.rb +++ b/spec/factories/clusters/applications/helm.rb @@ -5,7 +5,7 @@ FactoryBot.define do cluster factory: %i(cluster provided_by_gcp) before(:create) do - allow(Gitlab::Kubernetes::Helm::Certificate).to receive(:generate_root) + allow(Gitlab::Kubernetes::Helm::V2::Certificate).to receive(:generate_root) .and_return( double( key_string: File.read(Rails.root.join('spec/fixtures/clusters/sample_key.key')), @@ -15,7 +15,7 @@ FactoryBot.define do end after(:create) do - allow(Gitlab::Kubernetes::Helm::Certificate).to receive(:generate_root).and_call_original + allow(Gitlab::Kubernetes::Helm::V2::Certificate).to receive(:generate_root).and_call_original end trait :not_installable do |