From f9364929bacf9ed68e32bb50758e24715d404069 Mon Sep 17 00:00:00 2001 From: Alessio Caiazza Date: Tue, 7 Nov 2017 09:34:07 +0100 Subject: Rename application_helm factory to cluster_application_helm --- .../clusters/applications/check_installation_progress_service_spec.rb | 4 ++-- spec/services/clusters/applications/install_service_spec.rb | 4 ++-- .../clusters/applications/schedule_installation_service_spec.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/services/clusters') 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 faa5b469069..75fc05d36e9 100644 --- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb +++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Clusters::Applications::CheckInstallationProgressService do RESCHEDULE_PHASES = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze - let(:application) { create(:applications_helm, :installing) } + let(:application) { create(:cluster_applications_helm, :installing) } let(:service) { described_class.new(application) } let(:phase) { Gitlab::Kubernetes::Pod::UNKNOWN } let(:errors) { nil } @@ -33,7 +33,7 @@ describe Clusters::Applications::CheckInstallationProgressService do end context 'when timeouted' do - let(:application) { create(:applications_helm, :timeouted) } + let(:application) { create(:cluster_applications_helm, :timeouted) } it_behaves_like 'a terminated installation' diff --git a/spec/services/clusters/applications/install_service_spec.rb b/spec/services/clusters/applications/install_service_spec.rb index a646dac1cae..ae8dc7b2bd9 100644 --- a/spec/services/clusters/applications/install_service_spec.rb +++ b/spec/services/clusters/applications/install_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Clusters::Applications::InstallService do describe '#execute' do - let(:application) { create(:applications_helm, :scheduled) } + let(:application) { create(:cluster_applications_helm, :scheduled) } let(:service) { described_class.new(application) } context 'when there are no errors' do @@ -39,7 +39,7 @@ describe Clusters::Applications::InstallService do end context 'when application cannot be persisted' do - let(:application) { build(:applications_helm, :scheduled) } + let(:application) { build(:cluster_applications_helm, :scheduled) } it 'make the application errored' do expect(application).to receive(:make_installing!).once.and_raise(ActiveRecord::RecordInvalid) diff --git a/spec/services/clusters/applications/schedule_installation_service_spec.rb b/spec/services/clusters/applications/schedule_installation_service_spec.rb index 6ba587a41db..cf95361c935 100644 --- a/spec/services/clusters/applications/schedule_installation_service_spec.rb +++ b/spec/services/clusters/applications/schedule_installation_service_spec.rb @@ -32,7 +32,7 @@ describe Clusters::Applications::ScheduleInstallationService do end context 'when installation is already in progress' do - let(:application) { create(:applications_helm, :installing) } + let(:application) { create(:cluster_applications_helm, :installing) } let(:cluster) { application.cluster } it_behaves_like 'a failing service' -- cgit v1.2.1