From f9364929bacf9ed68e32bb50758e24715d404069 Mon Sep 17 00:00:00 2001 From: Alessio Caiazza Date: Tue, 7 Nov 2017 09:34:07 +0100 Subject: [PATCH] Rename application_helm factory to cluster_application_helm --- spec/factories/clusters/applications/helm.rb | 8 ++------ spec/models/clusters/applications/helm_spec.rb | 10 +++++----- spec/serializers/cluster_application_entity_spec.rb | 4 ++-- .../check_installation_progress_service_spec.rb | 4 ++-- .../clusters/applications/install_service_spec.rb | 4 ++-- .../applications/schedule_installation_service_spec.rb | 2 +- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb index fd956097115..b63e26125d1 100644 --- a/spec/factories/clusters/applications/helm.rb +++ b/spec/factories/clusters/applications/helm.rb @@ -1,10 +1,6 @@ FactoryGirl.define do - factory :applications_helm, class: Clusters::Applications::Helm do - trait :cluster do - before(:create) do |app, _| - app.cluster = create(:cluster) - end - end + factory :cluster_applications_helm, class: Clusters::Applications::Helm do + cluster factory: :cluster trait :installable do cluster diff --git a/spec/models/clusters/applications/helm_spec.rb b/spec/models/clusters/applications/helm_spec.rb index 54fce7d886a..44fb60f0ed0 100644 --- a/spec/models/clusters/applications/helm_spec.rb +++ b/spec/models/clusters/applications/helm_spec.rb @@ -28,7 +28,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do describe 'status state machine' do describe '#make_installing' do - subject { create(:applications_helm, :scheduled) } + subject { create(:cluster_applications_helm, :scheduled) } it 'is installing' do subject.make_installing! @@ -38,7 +38,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do end describe '#make_installed' do - subject { create(:applications_helm, :installing) } + subject { create(:cluster_applications_helm, :installing) } it 'is installed' do subject.make_installed @@ -48,7 +48,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do end describe '#make_errored' do - subject { create(:applications_helm, :installing) } + subject { create(:cluster_applications_helm, :installing) } let(:reason) { 'some errors' } it 'is errored' do @@ -60,7 +60,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do end describe '#make_scheduled' do - subject { create(:applications_helm, :installable) } + subject { create(:cluster_applications_helm, :installable) } it 'is scheduled' do subject.make_scheduled @@ -69,7 +69,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do end describe 'when was errored' do - subject { create(:applications_helm, :errored) } + subject { create(:cluster_applications_helm, :errored) } it 'clears #status_reason' do expect(subject.status_reason).not_to be_nil diff --git a/spec/serializers/cluster_application_entity_spec.rb b/spec/serializers/cluster_application_entity_spec.rb index 61cebcefa28..8a3a081adf8 100644 --- a/spec/serializers/cluster_application_entity_spec.rb +++ b/spec/serializers/cluster_application_entity_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe ClusterApplicationEntity do describe '#as_json' do - let(:application) { build(:applications_helm) } + let(:application) { build(:cluster_applications_helm) } subject { described_class.new(application).as_json } it 'has name' do @@ -18,7 +18,7 @@ describe ClusterApplicationEntity do end context 'when application is errored' do - let(:application) { build(:applications_helm, :errored) } + let(:application) { build(:cluster_applications_helm, :errored) } it 'has corresponded data' do expect(subject[:status]).to eq(:errored) 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'