From cb0a625459525122d2736a895a728edb3b8ea4ff Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 18 Jun 2021 21:10:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../applications/activate_service_worker_spec.rb | 22 +++++++-------- .../applications/deactivate_service_worker_spec.rb | 32 +++++++++++----------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'spec/workers/clusters') diff --git a/spec/workers/clusters/applications/activate_service_worker_spec.rb b/spec/workers/clusters/applications/activate_service_worker_spec.rb index 7b05b76bebc..019bfe7a750 100644 --- a/spec/workers/clusters/applications/activate_service_worker_spec.rb +++ b/spec/workers/clusters/applications/activate_service_worker_spec.rb @@ -4,8 +4,8 @@ require 'spec_helper' RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do context 'cluster exists' do - describe 'prometheus service' do - let(:service_name) { 'prometheus' } + describe 'prometheus integration' do + let(:integration_name) { 'prometheus' } before do create(:clusters_integrations_prometheus, cluster: cluster) @@ -16,9 +16,9 @@ RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do let(:project) { create(:project, group: group) } let(:cluster) { create(:cluster_for_group, groups: [group]) } - it 'ensures Prometheus service is activated' do - expect { described_class.new.perform(cluster.id, service_name) } - .to change { project.reload.prometheus_service&.active }.from(nil).to(true) + 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 @@ -26,9 +26,9 @@ RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do let(:project) { create(:project) } let(:cluster) { create(:cluster, projects: [project]) } - it 'ensures Prometheus service is activated' do - expect { described_class.new.perform(cluster.id, service_name) } - .to change { project.reload.prometheus_service&.active }.from(nil).to(true) + 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 @@ -36,9 +36,9 @@ RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do let(:project) { create(:project) } let(:cluster) { create(:cluster, :instance) } - it 'ensures Prometheus service is activated' do - expect { described_class.new.perform(cluster.id, service_name) } - .to change { project.reload.prometheus_service&.active }.from(nil).to(true) + 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 diff --git a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb b/spec/workers/clusters/applications/deactivate_service_worker_spec.rb index 4068c5c9eaa..77788cfa893 100644 --- a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb +++ b/spec/workers/clusters/applications/deactivate_service_worker_spec.rb @@ -4,15 +4,15 @@ require 'spec_helper' RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do context 'cluster exists' do - describe 'prometheus service' do - let(:service_name) { 'prometheus' } + describe 'prometheus integration' do + let(:integration_name) { 'prometheus' } let!(:integration) { create(:clusters_integrations_prometheus, cluster: cluster) } - context 'prometheus service exists' do - let!(:prometheus_service) { create(:prometheus_service, project: project, manual_configuration: false, active: true) } + context 'prometheus integration exists' do + let!(:prometheus_integration) { create(:prometheus_integration, project: project, manual_configuration: false, active: true) } before do - integration.delete # prometheus service before save synchronises active stated with integration existence. + integration.delete # prometheus integration before save synchronises active stated with integration existence. end context 'cluster type: group' do @@ -20,9 +20,9 @@ RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do let(:project) { create(:project, group: group) } let(:cluster) { create(:cluster_for_group, groups: [group]) } - it 'ensures Prometheus service is deactivated' do - expect { described_class.new.perform(cluster.id, service_name) } - .to change { prometheus_service.reload.active }.from(true).to(false) + 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 @@ -30,9 +30,9 @@ RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do let(:project) { create(:project) } let(:cluster) { create(:cluster, projects: [project]) } - it 'ensures Prometheus service is deactivated' do - expect { described_class.new.perform(cluster.id, service_name) } - .to change { prometheus_service.reload.active }.from(true).to(false) + 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 @@ -40,20 +40,20 @@ RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do let(:project) { create(:project) } let(:cluster) { create(:cluster, :instance) } - it 'ensures Prometheus service is deactivated' do - expect { described_class.new.perform(cluster.id, service_name) } - .to change { prometheus_service.reload.active }.from(true).to(false) + 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 - context 'prometheus service does not exist' do + context 'prometheus integration does not exist' do context 'cluster type: project' do let(:project) { create(:project) } let(:cluster) { create(:cluster, projects: [project]) } it 'does not raise errors' do - expect { described_class.new.perform(cluster.id, service_name) }.not_to raise_error + expect { described_class.new.perform(cluster.id, integration_name) }.not_to raise_error end end end -- cgit v1.2.3