3 files changed, 38 insertions, 18 deletions
diff --git a/spec/workers/clusters/applications/activate_service_worker_spec.rb b/spec/workers/clusters/applications/activate_integration_worker_spec.rb
index d13ff76613c..ecb49be5a4b 100644
--- a/spec/workers/clusters/applications/activate_service_worker_spec.rb
+++ b/spec/workers/clusters/applications/activate_integration_worker_spec.rb
@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do
-  context 'cluster exists' do
+RSpec.describe Clusters::Applications::ActivateIntegrationWorker, '#perform' do
+  context 'when cluster exists' do
     describe 'prometheus integration' do
       let(:integration_name) { 'prometheus' }
 
@@ -11,7 +11,7 @@ RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do
         create(:clusters_integrations_prometheus, cluster: cluster)
       end
 
-      context 'cluster type: group' do
+      context 'with cluster type: group' do
         let(:group) { create(:group) }
         let(:project) { create(:project, group: group) }
         let(:cluster) { create(:cluster_for_group, groups: [group]) }
@@ -22,7 +22,7 @@ RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do
         end
       end
 
-      context 'cluster type: project' do
+      context 'with cluster type: project' do
         let(:project) { create(:project) }
         let(:cluster) { create(:cluster, projects: [project]) }
 
@@ -32,7 +32,7 @@ RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do
         end
       end
 
-      context 'cluster type: instance' do
+      context 'with cluster type: instance' do
         let(:project) { create(:project) }
         let(:cluster) { create(:cluster, :instance) }
 
@@ -40,11 +40,20 @@ RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do
           expect { described_class.new.perform(cluster.id, integration_name) }
             .to change { project.reload.prometheus_integration&.active }.from(nil).to(true)
         end
+
+        context 'when using the old worker class' do
+          let(:described_class) { Clusters::Applications::ActivateServiceWorker }
+
+          it 'ensures Prometheus integration is activated' do
+            expect { described_class.new.perform(cluster.id, integration_name) }
+              .to change { project.reload.prometheus_integration&.active }.from(nil).to(true)
+          end
+        end
       end
     end
   end
 
-  context 'cluster does not exist' do
+  context 'when cluster does not exist' do
     it 'does not raise Record Not Found error' do
       expect { described_class.new.perform(0, 'ignored in this context') }.not_to raise_error
     end
diff --git a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb b/spec/workers/clusters/applications/deactivate_integration_worker_spec.rb
index 77788cfa893..3f0188eee23 100644
--- a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb
+++ b/spec/workers/clusters/applications/deactivate_integration_worker_spec.rb
@@ -2,20 +2,22 @@
 
 require 'spec_helper'
 
-RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do
-  context 'cluster exists' do
+RSpec.describe Clusters::Applications::DeactivateIntegrationWorker, '#perform' do
+  context 'when cluster exists' do
     describe 'prometheus integration' do
       let(:integration_name) { 'prometheus' }
       let!(:integration) { create(:clusters_integrations_prometheus, cluster: cluster) }
 
-      context 'prometheus integration exists' do
-        let!(:prometheus_integration) { create(:prometheus_integration, project: project, manual_configuration: false, active: true) }
+      context 'when prometheus integration exists' do
+        let!(:prometheus_integration) do
+          create(:prometheus_integration, project: project, manual_configuration: false, active: true)
+        end
 
         before do
           integration.delete # prometheus integration before save synchronises active stated with integration existence.
         end
 
-        context 'cluster type: group' do
+        context 'with cluster type: group' do
           let(:group) { create(:group) }
           let(:project) { create(:project, group: group) }
           let(:cluster) { create(:cluster_for_group, groups: [group]) }
@@ -26,7 +28,7 @@ RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do
           end
         end
 
-        context 'cluster type: project' do
+        context 'with cluster type: project' do
           let(:project) { create(:project) }
           let(:cluster) { create(:cluster, projects: [project]) }
 
@@ -36,7 +38,7 @@ RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do
           end
         end
 
-        context 'cluster type: instance' do
+        context 'with cluster type: instance' do
           let(:project) { create(:project) }
           let(:cluster) { create(:cluster, :instance) }
 
@@ -44,11 +46,20 @@ RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do
             expect { described_class.new.perform(cluster.id, integration_name) }
               .to change { prometheus_integration.reload.active }.from(true).to(false)
           end
+
+          context 'when using the old worker class' do
+            let(:described_class) { Clusters::Applications::ActivateServiceWorker }
+
+            it 'ensures Prometheus integration is deactivated' do
+              expect { described_class.new.perform(cluster.id, integration_name) }
+                .to change { prometheus_integration.reload.active }.from(true).to(false)
+            end
+          end
         end
       end
 
-      context 'prometheus integration does not exist' do
-        context 'cluster type: project' do
+      context 'when prometheus integration does not exist' do
+        context 'with cluster type: project' do
           let(:project) { create(:project) }
           let(:cluster) { create(:cluster, projects: [project]) }
 
@@ -60,7 +71,7 @@ RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do
     end
   end
 
-  context 'cluster does not exist' do
+  context 'when cluster does not exist' do
     it 'raises Record Not Found error' do
       expect { described_class.new.perform(0, 'ignored in this context') }.to raise_error(ActiveRecord::RecordNotFound)
     end
diff --git a/spec/workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb b/spec/workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb
index 0191a2898b2..d1dd1cd738b 100644
--- a/spec/workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb
+++ b/spec/workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Clusters::Applications::WaitForUninstallAppWorker, '#perform' do
 
   subject { described_class.new.perform(app_name, app_id) }
 
-  context 'app exists' do
+  context 'when app exists' do
     let(:service) { instance_double(Clusters::Applications::CheckUninstallProgressService) }
 
     it 'calls the check service' do
@@ -20,7 +20,7 @@ RSpec.describe Clusters::Applications::WaitForUninstallAppWorker, '#perform' do
     end
   end
 
-  context 'app does not exist' do
+  context 'when app does not exist' do
     let(:app_id) { 0 }
 
     it 'does not call the check service' do