1 files changed, 5 insertions, 39 deletions
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 2fce120381b..34ee1eafd5c 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -17,6 +17,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
     context 'when service is active' do
       before do
         subject.active = true
+        subject.skip_deprecation_validation = true
       end
 
       it { is_expected.not_to validate_presence_of(:namespace) }
@@ -67,6 +68,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
 
       before do
         kubernetes_service.update_attribute(:active, false)
+        kubernetes_service.skip_deprecation_validation = false
         kubernetes_service.properties['namespace'] = "foo"
       end
 
@@ -80,19 +82,11 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
       end
     end
 
-    context 'with a non-deprecated service' do
-      let(:kubernetes_service) { create(:kubernetes_service) }
-
-      it 'updates attributes' do
-        kubernetes_service.properties['namespace'] = 'foo'
-        expect(kubernetes_service.save).to be_truthy
-      end
-    end
-
     context 'with an active and deprecated service' do
       let(:kubernetes_service) { create(:kubernetes_service) }
 
       before do
+        kubernetes_service.skip_deprecation_validation = false
         kubernetes_service.active = false
         kubernetes_service.properties['namespace'] = 'foo'
         kubernetes_service.save
@@ -110,19 +104,6 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
         expect(kubernetes_service.properties['namespace']).to eq("foo")
       end
     end
-
-    context 'with a template service' do
-      let(:kubernetes_service) { create(:kubernetes_service, template: true, active: false) }
-
-      before do
-        kubernetes_service.properties['namespace'] = 'foo'
-      end
-
-      it 'updates attributes' do
-        expect(kubernetes_service.save).to be_truthy
-        expect(kubernetes_service.properties['namespace']).to eq('foo')
-      end
-    end
   end
 
   describe '#initialize_properties' do
@@ -393,17 +374,8 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
   describe "#deprecated?" do
     let(:kubernetes_service) { create(:kubernetes_service) }
 
-    context 'with an active kubernetes service' do
-      it 'returns false' do
-        expect(kubernetes_service.deprecated?).to be_falsy
-      end
-    end
-
-    context 'with a inactive kubernetes service' do
-      it 'returns true' do
-        kubernetes_service.update_attribute(:active, false)
-        expect(kubernetes_service.deprecated?).to be_truthy
-      end
+    it 'returns true' do
+      expect(kubernetes_service.deprecated?).to be_truthy
     end
   end
 
@@ -414,12 +386,6 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
       expect(kubernetes_service.deprecation_message).to match(/Kubernetes service integration has been deprecated/)
     end
 
-    context 'if the services is active' do
-      it 'returns a message' do
-        expect(kubernetes_service.deprecation_message).to match(/Your Kubernetes cluster information on this page is still editable/)
-      end
-    end
-
     context 'if the service is not active' do
       it 'returns a message' do
         kubernetes_service.update_attribute(:active, false)