diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-19 00:10:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-19 00:10:06 +0300 |
commit | cb0a625459525122d2736a895a728edb3b8ea4ff (patch) | |
tree | a3a830de41cdc0eb71c380f8e751faa1410a724a /spec/workers | |
parent | dd6e32bf47776514b8fe2abcfe7998503f16baab (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
3 files changed, 42 insertions, 42 deletions
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 diff --git a/spec/workers/projects/post_creation_worker_spec.rb b/spec/workers/projects/post_creation_worker_spec.rb index d1600daa3bd..06acf601666 100644 --- a/spec/workers/projects/post_creation_worker_spec.rb +++ b/spec/workers/projects/post_creation_worker_spec.rb @@ -13,16 +13,16 @@ RSpec.describe Projects::PostCreationWorker do it_behaves_like 'an idempotent worker' do let(:job_args) { [project.id] } - describe 'Prometheus service' do + describe 'Prometheus integration' do context 'project is nil' do let(:job_args) { [nil] } - it 'does not create prometheus service' do + it 'does not create prometheus integration' do expect { subject }.not_to change { Integration.count } end end - context 'when project has access to shared service' do + context 'when project has access to shared integration' do context 'Prometheus application is shared via group cluster' do let(:project) { create(:project, group: group) } let(:cluster) { create(:cluster, :group, groups: [group]) } @@ -39,10 +39,10 @@ RSpec.describe Projects::PostCreationWorker do it 'creates an Integrations::Prometheus record', :aggregate_failures do subject - service = project.prometheus_service - expect(service.active).to be true - expect(service.manual_configuration?).to be false - expect(service.persisted?).to be true + integration = project.prometheus_integration + expect(integration.active).to be true + expect(integration.manual_configuration?).to be false + expect(integration.persisted?).to be true end end @@ -56,20 +56,20 @@ RSpec.describe Projects::PostCreationWorker do it 'creates an Integrations::Prometheus record', :aggregate_failures do subject - service = project.prometheus_service - expect(service.active).to be true - expect(service.manual_configuration?).to be false - expect(service.persisted?).to be true + integration = project.prometheus_integration + expect(integration.active).to be true + expect(integration.manual_configuration?).to be false + expect(integration.persisted?).to be true end it 'cleans invalid record and logs warning', :aggregate_failures do - invalid_service_record = build(:prometheus_service, properties: { api_url: nil, manual_configuration: true }.to_json) - allow(::Integrations::Prometheus).to receive(:new).and_return(invalid_service_record) + invalid_integration_record = build(:prometheus_integration, properties: { api_url: nil, manual_configuration: true }.to_json) + allow(::Integrations::Prometheus).to receive(:new).and_return(invalid_integration_record) expect(Gitlab::ErrorTracking).to receive(:track_exception).with(an_instance_of(ActiveRecord::RecordInvalid), include(extra: { project_id: a_kind_of(Integer) })).twice subject - expect(project.prometheus_service).to be_nil + expect(project.prometheus_integration).to be_nil end end @@ -77,7 +77,7 @@ RSpec.describe Projects::PostCreationWorker do it 'does not persist an Integrations::Prometheus record' do subject - expect(project.prometheus_service).to be_nil + expect(project.prometheus_integration).to be_nil end end end |