diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 21:07:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 21:07:59 +0300 |
commit | 7ebcead8cfd2edb810dd0cbda816b6cfbd170fe3 (patch) | |
tree | 11880c4059c89149cf997e9b958fb6d32c7dbdad /spec/services/clusters/applications | |
parent | f1a40d0db939dfe8ff95d385e652ff72566be765 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/clusters/applications')
6 files changed, 6 insertions, 6 deletions
diff --git a/spec/services/clusters/applications/check_installation_progress_service_spec.rb b/spec/services/clusters/applications/check_installation_progress_service_spec.rb index 2f224d40920..4b8db405101 100644 --- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb +++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb @@ -144,7 +144,7 @@ describe Clusters::Applications::CheckInstallationProgressService, '#execute' do end it 'removes the installation POD' do - expect_next_instance_of(Gitlab::Kubernetes::Helm::Api) do |instance| + expect_next_instance_of(Gitlab::Kubernetes::Helm::API) do |instance| expect(instance).to receive(:delete_pod!).with(kind_of(String)).once end expect(service).to receive(:remove_installation_pod).and_call_original diff --git a/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb b/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb index 93557c6b229..ffb658330d3 100644 --- a/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb +++ b/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb @@ -48,7 +48,7 @@ describe Clusters::Applications::CheckUninstallProgressService do let(:phase) { Gitlab::Kubernetes::Pod::SUCCEEDED } before do - expect_next_instance_of(Gitlab::Kubernetes::Helm::Api) do |instance| + expect_next_instance_of(Gitlab::Kubernetes::Helm::API) do |instance| expect(instance).to receive(:delete_pod!).with(kind_of(String)).once end expect(service).to receive(:pod_phase).once.and_return(phase) diff --git a/spec/services/clusters/applications/install_service_spec.rb b/spec/services/clusters/applications/install_service_spec.rb index 9e1ae5e8742..2441cc595a3 100644 --- a/spec/services/clusters/applications/install_service_spec.rb +++ b/spec/services/clusters/applications/install_service_spec.rb @@ -7,7 +7,7 @@ describe Clusters::Applications::InstallService do let(:application) { create(:clusters_applications_helm, :scheduled) } let!(:install_command) { application.install_command } let(:service) { described_class.new(application) } - let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::Api) } + let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::API) } before do allow(service).to receive(:install_command).and_return(install_command) diff --git a/spec/services/clusters/applications/patch_service_spec.rb b/spec/services/clusters/applications/patch_service_spec.rb index c6d0fee43c4..dc9843a5116 100644 --- a/spec/services/clusters/applications/patch_service_spec.rb +++ b/spec/services/clusters/applications/patch_service_spec.rb @@ -7,7 +7,7 @@ describe Clusters::Applications::PatchService do let(:application) { create(:clusters_applications_knative, :scheduled) } let!(:update_command) { application.update_command } let(:service) { described_class.new(application) } - let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::Api) } + let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::API) } before do allow(service).to receive(:update_command).and_return(update_command) diff --git a/spec/services/clusters/applications/uninstall_service_spec.rb b/spec/services/clusters/applications/uninstall_service_spec.rb index 16497d752b2..6d7f0478b20 100644 --- a/spec/services/clusters/applications/uninstall_service_spec.rb +++ b/spec/services/clusters/applications/uninstall_service_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe Clusters::Applications::UninstallService, '#execute' do let(:application) { create(:clusters_applications_prometheus, :scheduled) } let(:service) { described_class.new(application) } - let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::Api) } + let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::API) } let(:worker_class) { Clusters::Applications::WaitForUninstallAppWorker } before do diff --git a/spec/services/clusters/applications/upgrade_service_spec.rb b/spec/services/clusters/applications/upgrade_service_spec.rb index 48fa79eeb97..86fb06375f1 100644 --- a/spec/services/clusters/applications/upgrade_service_spec.rb +++ b/spec/services/clusters/applications/upgrade_service_spec.rb @@ -7,7 +7,7 @@ describe Clusters::Applications::UpgradeService do let(:application) { create(:clusters_applications_helm, :scheduled) } let!(:install_command) { application.install_command } let(:service) { described_class.new(application) } - let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::Api) } + let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::API) } before do allow(service).to receive(:install_command).and_return(install_command) |