From 4c5468b40825debc2b7bbe08b975dedd2f7f1523 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 24 Jun 2020 15:08:50 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/workers/clusters/applications/activate_service_worker_spec.rb | 2 +- .../clusters/applications/check_prometheus_health_worker_spec.rb | 2 +- spec/workers/clusters/applications/deactivate_service_worker_spec.rb | 2 +- .../workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb | 2 +- spec/workers/clusters/cleanup/app_worker_spec.rb | 2 +- spec/workers/clusters/cleanup/project_namespace_worker_spec.rb | 2 +- spec/workers/clusters/cleanup/service_account_worker_spec.rb | 2 +- 7 files changed, 7 insertions(+), 7 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 09f4c536edf..c157c57888e 100644 --- a/spec/workers/clusters/applications/activate_service_worker_spec.rb +++ b/spec/workers/clusters/applications/activate_service_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::ActivateServiceWorker, '#perform' do +RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do context 'cluster exists' do describe 'prometheus service' do let(:service_name) { 'prometheus' } diff --git a/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb b/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb index a09b9ec4165..5a37031a55a 100644 --- a/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb +++ b/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::CheckPrometheusHealthWorker, '#perform' do +RSpec.describe Clusters::Applications::CheckPrometheusHealthWorker, '#perform' do subject { described_class.new.perform } it 'triggers health service' do diff --git a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb b/spec/workers/clusters/applications/deactivate_service_worker_spec.rb index 809843a1bc8..18cceaaf3b1 100644 --- a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb +++ b/spec/workers/clusters/applications/deactivate_service_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::DeactivateServiceWorker, '#perform' do +RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do context 'cluster exists' do describe 'prometheus service' do let(:service_name) { 'prometheus' } 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 aaf5c9defc4..0191a2898b2 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 @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::WaitForUninstallAppWorker, '#perform' do +RSpec.describe Clusters::Applications::WaitForUninstallAppWorker, '#perform' do let(:app) { create(:clusters_applications_helm) } let(:app_name) { app.name } let(:app_id) { app.id } diff --git a/spec/workers/clusters/cleanup/app_worker_spec.rb b/spec/workers/clusters/cleanup/app_worker_spec.rb index 29c00db8079..661468f037f 100644 --- a/spec/workers/clusters/cleanup/app_worker_spec.rb +++ b/spec/workers/clusters/cleanup/app_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Cleanup::AppWorker do +RSpec.describe Clusters::Cleanup::AppWorker do describe '#perform' do subject { worker_instance.perform(cluster.id) } diff --git a/spec/workers/clusters/cleanup/project_namespace_worker_spec.rb b/spec/workers/clusters/cleanup/project_namespace_worker_spec.rb index 8b6f22e9a61..b9219586a0b 100644 --- a/spec/workers/clusters/cleanup/project_namespace_worker_spec.rb +++ b/spec/workers/clusters/cleanup/project_namespace_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Cleanup::ProjectNamespaceWorker do +RSpec.describe Clusters::Cleanup::ProjectNamespaceWorker do describe '#perform' do context 'when cluster.cleanup_status is cleanup_removing_project_namespaces' do let!(:cluster) { create(:cluster, :with_environments, :cleanup_removing_project_namespaces) } diff --git a/spec/workers/clusters/cleanup/service_account_worker_spec.rb b/spec/workers/clusters/cleanup/service_account_worker_spec.rb index 9af53dd63c1..dabc32a0ccd 100644 --- a/spec/workers/clusters/cleanup/service_account_worker_spec.rb +++ b/spec/workers/clusters/cleanup/service_account_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Cleanup::ServiceAccountWorker do +RSpec.describe Clusters::Cleanup::ServiceAccountWorker do describe '#perform' do let!(:cluster) { create(:cluster, :cleanup_removing_service_account) } -- cgit v1.2.3