From 1d7e3ef1a55991e057213add556926eb13e0bd48 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Mon, 27 Nov 2017 21:48:54 +0900 Subject: Duplicate spec for Platform::Kubernetes with kubernetes_project --- spec/workers/reactive_caching_worker_spec.rb | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'spec/workers') diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb index 5f4453c15d6..98282af2d18 100644 --- a/spec/workers/reactive_caching_worker_spec.rb +++ b/spec/workers/reactive_caching_worker_spec.rb @@ -1,15 +1,29 @@ require 'spec_helper' describe ReactiveCachingWorker do - let(:project) { create(:kubernetes_project) } let(:service) { project.deployment_service } subject { described_class.new.perform("KubernetesService", service.id) } describe '#perform' do - it 'calls #exclusively_update_reactive_cache!' do - expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!) + shared_examples 'correct behavior with perform' do + it 'calls #exclusively_update_reactive_cache!' do + expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!) - subject + subject + end + end + + context 'when user configured kubernetes from Integration > Kubernetes' do + let(:project) { create(:kubernetes_project) } + + it_behaves_like 'correct behavior with perform' + 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 perform' end end end -- cgit v1.2.1 From 53da3d976f3705a87edc50dca41748b5e479fc83 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Mon, 27 Nov 2017 22:35:16 +0900 Subject: Replce kubernetes_service and deployment_service to deployment_platform --- spec/workers/reactive_caching_worker_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/workers') diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb index 98282af2d18..dd654c941bc 100644 --- a/spec/workers/reactive_caching_worker_spec.rb +++ b/spec/workers/reactive_caching_worker_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe ReactiveCachingWorker do - let(:service) { project.deployment_service } + let(:service) { project.deployment_platform } subject { described_class.new.perform("KubernetesService", service.id) } describe '#perform' do -- cgit v1.2.1 From c36d7842da24e6726705199f178c1324c634bdaf Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Mon, 27 Nov 2017 23:19:16 +0900 Subject: Aling shared_exmaples to "same behavior between KubernetesService and Platform::Kubernetes" --- spec/workers/reactive_caching_worker_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/workers') diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb index dd654c941bc..225d3e38542 100644 --- a/spec/workers/reactive_caching_worker_spec.rb +++ b/spec/workers/reactive_caching_worker_spec.rb @@ -5,7 +5,7 @@ describe ReactiveCachingWorker do subject { described_class.new.perform("KubernetesService", service.id) } describe '#perform' do - shared_examples 'correct behavior with perform' do + shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do it 'calls #exclusively_update_reactive_cache!' do expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!) @@ -16,14 +16,14 @@ describe ReactiveCachingWorker do context 'when user configured kubernetes from Integration > Kubernetes' do let(:project) { create(:kubernetes_project) } - it_behaves_like 'correct behavior with perform' + 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 perform' + it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' end end end -- cgit v1.2.1 From f6d9dcf8382a00a5f2ae2100b13774b01f0328bb Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Mon, 27 Nov 2017 23:55:25 +0900 Subject: Fix unit tests --- spec/workers/reactive_caching_worker_spec.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'spec/workers') diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb index 225d3e38542..3da851de067 100644 --- a/spec/workers/reactive_caching_worker_spec.rb +++ b/spec/workers/reactive_caching_worker_spec.rb @@ -2,28 +2,27 @@ require 'spec_helper' describe ReactiveCachingWorker do let(:service) { project.deployment_platform } - subject { described_class.new.perform("KubernetesService", service.id) } describe '#perform' do - shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do + context 'when user configured kubernetes from Integration > Kubernetes' do + let(:project) { create(:kubernetes_project) } + it 'calls #exclusively_update_reactive_cache!' do expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!) - subject + described_class.new.perform("KubernetesService", service.id) end end - context 'when user configured kubernetes from Integration > Kubernetes' do - let(:project) { create(:kubernetes_project) } - - 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 'same behavior between KubernetesService and Platform::Kubernetes' + it 'calls #exclusively_update_reactive_cache!' do + expect_any_instance_of(Clusters::Platforms::Kubernetes).to receive(:exclusively_update_reactive_cache!) + + described_class.new.perform("Clusters::Platforms::Kubernetes", service.id) + end end end end -- cgit v1.2.1