diff options
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 6 | ||||
-rw-r--r-- | spec/models/clusters/platforms/kubernetes_spec.rb | 49 | ||||
-rw-r--r-- | spec/models/environment_spec.rb | 12 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 6 |
4 files changed, 12 insertions, 61 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index c53942ed61c..4cf0088ac9c 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -557,7 +557,7 @@ describe Ci::Pipeline, :mailer do describe '#has_kubernetes_active?' do context 'when kubernetes is active' do - shared_examples 'correct behavior with has_kubernetes_active?' do + shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do it 'returns true' do expect(pipeline).to have_kubernetes_active end @@ -566,14 +566,14 @@ describe Ci::Pipeline, :mailer do context 'when user configured kubernetes from Integration > Kubernetes' do let(:project) { create(:kubernetes_project) } - it_behaves_like 'correct behavior with has_kubernetes_active?' + it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' end context 'when user configured kubernetes from CI/CD > Clusters' do let!(:cluster) { create(:cluster, :project, :provided_by_gcp) } let(:project) { cluster.project } - it_behaves_like 'correct behavior with has_kubernetes_active?' + it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' end end diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb index 7c5a17a4e95..53a4e545ff6 100644 --- a/spec/models/clusters/platforms/kubernetes_spec.rb +++ b/spec/models/clusters/platforms/kubernetes_spec.rb @@ -92,55 +92,6 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching end end - describe 'after_save from Clusters::Cluster' do - # context 'when platform_kubernetes is being cerated' do - # let(:enabled) { true } - # let(:project) { create(:project) } - # let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, enabled: enabled, projects: [project]) } - # let(:platform) { build(:cluster_platform_kubernetes, :configured) } - # let(:provider) { build(:cluster_provider_gcp) } - # let(:kubernetes_service) { project.kubernetes_service } - - # it 'updates KubernetesService' do - # cluster.save! - - # expect(kubernetes_service.active).to eq(enabled) - # expect(kubernetes_service.api_url).to eq(platform.api_url) - # expect(kubernetes_service.namespace).to eq(platform.namespace) - # expect(kubernetes_service.ca_pem).to eq(platform.ca_cert) - # end - # end - - # context 'when platform_kubernetes has been created' do - # let(:enabled) { false } - # let!(:project) { create(:project) } - # let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } - # let(:platform) { cluster.platform } - # let(:kubernetes_service) { project.kubernetes_service } - - # it 'updates KubernetesService' do - # cluster.update(enabled: enabled) - - # expect(kubernetes_service.active).to eq(enabled) - # end - # end - - # context 'when kubernetes_service has been configured without cluster integration' do - # let!(:project) { create(:project) } - # let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, projects: [project]) } - # let(:platform) { build(:cluster_platform_kubernetes, :configured, api_url: 'https://111.111.111.111') } - # let(:provider) { build(:cluster_provider_gcp) } - - # before do - # create(:kubernetes_service, project: project) - # end - - # it 'raises an error' do - # expect { cluster.save! }.to raise_error('Kubernetes service already configured') - # end - # end - end - describe '#actual_namespace' do subject { kubernetes.actual_namespace } diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb index dc71cf16f54..6f24a039998 100644 --- a/spec/models/environment_spec.rb +++ b/spec/models/environment_spec.rb @@ -327,7 +327,7 @@ describe Environment do context 'when the enviroment is available' do context 'with a deployment service' do - shared_examples 'correct behavior for has_terminals?' do + shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do context 'and a deployment' do let!(:deployment) { create(:deployment, environment: environment) } it { is_expected.to be_truthy } @@ -341,14 +341,14 @@ describe Environment do context 'when user configured kubernetes from Integration > Kubernetes' do let(:project) { create(:kubernetes_project) } - it_behaves_like 'correct behavior for has_terminals?' + it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' end context 'when user configured kubernetes from CI/CD > Clusters' do let!(:cluster) { create(:cluster, :project, :provided_by_gcp) } let(:project) { cluster.project } - it_behaves_like 'correct behavior for has_terminals?' + it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' end end @@ -376,7 +376,7 @@ describe Environment do allow(environment).to receive(:has_terminals?).and_return(true) end - shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do + shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do it 'returns the terminals from the deployment service' do expect(project.deployment_platform) .to receive(:terminals).with(environment) @@ -389,14 +389,14 @@ describe Environment do context 'when user configured kubernetes from Integration > Kubernetes' do let(:project) { create(:kubernetes_project) } - it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes' + it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' end context 'when user configured kubernetes from CI/CD > Clusters' do let!(:cluster) { create(:cluster, :project, :provided_by_gcp) } let(:project) { cluster.project } - it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes' + it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index a28b15c9d7b..41483a8a05e 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -2002,7 +2002,7 @@ describe Project do end context 'when project has a deployment service' do - shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do + shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do it 'returns variables from this service' do expect(project.deployment_variables).to include( { key: 'KUBE_TOKEN', value: project.deployment_platform.token, public: false } @@ -2013,14 +2013,14 @@ describe Project do context 'when user configured kubernetes from Integration > Kubernetes' do let(:project) { create(:kubernetes_project) } - it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes' + it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' end context 'when user configured kubernetes from CI/CD > Clusters' do let!(:cluster) { create(:cluster, :project, :provided_by_gcp) } let(:project) { cluster.project } - it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes' + it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' end end end |