From 948023c9c900344aa1e2f334bcaae5a194873b0d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 10 Jun 2022 12:09:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../activate_integration_worker_spec.rb | 61 +++++++++++++++++ .../applications/activate_service_worker_spec.rb | 52 -------------- .../deactivate_integration_worker_spec.rb | 79 ++++++++++++++++++++++ .../applications/deactivate_service_worker_spec.rb | 68 ------------------- .../wait_for_uninstall_app_worker_spec.rb | 4 +- 5 files changed, 142 insertions(+), 122 deletions(-) create mode 100644 spec/workers/clusters/applications/activate_integration_worker_spec.rb delete mode 100644 spec/workers/clusters/applications/activate_service_worker_spec.rb create mode 100644 spec/workers/clusters/applications/deactivate_integration_worker_spec.rb delete mode 100644 spec/workers/clusters/applications/deactivate_service_worker_spec.rb (limited to 'spec/workers/clusters') diff --git a/spec/workers/clusters/applications/activate_integration_worker_spec.rb b/spec/workers/clusters/applications/activate_integration_worker_spec.rb new file mode 100644 index 00000000000..ecb49be5a4b --- /dev/null +++ b/spec/workers/clusters/applications/activate_integration_worker_spec.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Clusters::Applications::ActivateIntegrationWorker, '#perform' do + context 'when cluster exists' do + describe 'prometheus integration' do + let(:integration_name) { 'prometheus' } + + before do + create(:clusters_integrations_prometheus, cluster: cluster) + end + + context 'with cluster type: group' do + let(:group) { create(:group) } + let(:project) { create(:project, group: group) } + let(:cluster) { create(:cluster_for_group, groups: [group]) } + + 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 + + context 'with cluster type: project' do + let(:project) { create(:project) } + let(:cluster) { create(:cluster, projects: [project]) } + + 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 + + context 'with cluster type: instance' do + let(:project) { create(:project) } + let(:cluster) { create(:cluster, :instance) } + + 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 + + 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 '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 + end +end diff --git a/spec/workers/clusters/applications/activate_service_worker_spec.rb b/spec/workers/clusters/applications/activate_service_worker_spec.rb deleted file mode 100644 index d13ff76613c..00000000000 --- a/spec/workers/clusters/applications/activate_service_worker_spec.rb +++ /dev/null @@ -1,52 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do - context 'cluster exists' do - describe 'prometheus integration' do - let(:integration_name) { 'prometheus' } - - before do - create(:clusters_integrations_prometheus, cluster: cluster) - end - - context 'cluster type: group' do - let(:group) { create(:group) } - let(:project) { create(:project, group: group) } - let(:cluster) { create(:cluster_for_group, groups: [group]) } - - 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 - - context 'cluster type: project' do - let(:project) { create(:project) } - let(:cluster) { create(:cluster, projects: [project]) } - - 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 - - context 'cluster type: instance' do - let(:project) { create(:project) } - let(:cluster) { create(:cluster, :instance) } - - 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 - - context '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 - end -end diff --git a/spec/workers/clusters/applications/deactivate_integration_worker_spec.rb b/spec/workers/clusters/applications/deactivate_integration_worker_spec.rb new file mode 100644 index 00000000000..3f0188eee23 --- /dev/null +++ b/spec/workers/clusters/applications/deactivate_integration_worker_spec.rb @@ -0,0 +1,79 @@ +# frozen_string_literal: true + +require 'spec_helper' + +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 '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 'with cluster type: group' do + let(:group) { create(:group) } + let(:project) { create(:project, group: group) } + let(:cluster) { create(:cluster_for_group, groups: [group]) } + + 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 + + context 'with cluster type: project' do + let(:project) { create(:project) } + let(:cluster) { create(:cluster, projects: [project]) } + + 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 + + context 'with cluster type: instance' do + let(:project) { create(:project) } + let(:cluster) { create(:cluster, :instance) } + + 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 + + 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 'when prometheus integration does not exist' do + context 'with 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, integration_name) }.not_to raise_error + end + end + end + end + end + + 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 + end +end diff --git a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb b/spec/workers/clusters/applications/deactivate_service_worker_spec.rb deleted file mode 100644 index 77788cfa893..00000000000 --- a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb +++ /dev/null @@ -1,68 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do - context '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) } - - before do - integration.delete # prometheus integration before save synchronises active stated with integration existence. - end - - context 'cluster type: group' do - let(:group) { create(:group) } - let(:project) { create(:project, group: group) } - let(:cluster) { create(:cluster_for_group, groups: [group]) } - - 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 - - context 'cluster type: project' do - let(:project) { create(:project) } - let(:cluster) { create(:cluster, projects: [project]) } - - 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 - - context 'cluster type: instance' do - let(:project) { create(:project) } - let(:cluster) { create(:cluster, :instance) } - - 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 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, integration_name) }.not_to raise_error - end - end - end - end - end - - context '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 - end -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 -- cgit v1.2.3