diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/services/clusters/applications | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/services/clusters/applications')
15 files changed, 15 insertions, 15 deletions
diff --git a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb index 84bca76e69b..605d9e67ab6 100644 --- a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb +++ b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::CheckIngressIpAddressService do +RSpec.describe Clusters::Applications::CheckIngressIpAddressService do include ExclusiveLeaseHelpers let(:application) { create(:clusters_applications_ingress, :installed) } diff --git a/spec/services/clusters/applications/check_installation_progress_service_spec.rb b/spec/services/clusters/applications/check_installation_progress_service_spec.rb index 4b8db405101..13f7cd62002 100644 --- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb +++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::CheckInstallationProgressService, '#execute' do +RSpec.describe Clusters::Applications::CheckInstallationProgressService, '#execute' do RESCHEDULE_PHASES = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze let(:application) { create(:clusters_applications_helm, :installing) } diff --git a/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb b/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb index 9dede1947f8..4b8893429cf 100644 --- a/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb +++ b/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::CheckUninstallProgressService do +RSpec.describe Clusters::Applications::CheckUninstallProgressService do reschedule_phases = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze let(:application) { create(:clusters_applications_prometheus, :uninstalling) } diff --git a/spec/services/clusters/applications/check_upgrade_progress_service_spec.rb b/spec/services/clusters/applications/check_upgrade_progress_service_spec.rb index 29ee897454a..dbde8cec9b9 100644 --- a/spec/services/clusters/applications/check_upgrade_progress_service_spec.rb +++ b/spec/services/clusters/applications/check_upgrade_progress_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::CheckUpgradeProgressService do +RSpec.describe Clusters::Applications::CheckUpgradeProgressService do reschedule_phashes = ::Gitlab::Kubernetes::Pod::PHASES - [::Gitlab::Kubernetes::Pod::SUCCEEDED, ::Gitlab::Kubernetes::Pod::FAILED, ::Gitlab].freeze diff --git a/spec/services/clusters/applications/create_service_spec.rb b/spec/services/clusters/applications/create_service_spec.rb index 0b48af408e1..f93ae2c62f3 100644 --- a/spec/services/clusters/applications/create_service_spec.rb +++ b/spec/services/clusters/applications/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::CreateService do +RSpec.describe Clusters::Applications::CreateService do include TestRequestHelpers let(:cluster) { create(:cluster, :project, :provided_by_gcp) } diff --git a/spec/services/clusters/applications/destroy_service_spec.rb b/spec/services/clusters/applications/destroy_service_spec.rb index 8d9dc6a0f11..7306256e68e 100644 --- a/spec/services/clusters/applications/destroy_service_spec.rb +++ b/spec/services/clusters/applications/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::DestroyService, '#execute' do +RSpec.describe Clusters::Applications::DestroyService, '#execute' do let(:cluster) { create(:cluster, :project, :provided_by_gcp) } let(:user) { create(:user) } let(:params) { { application: 'prometheus' } } diff --git a/spec/services/clusters/applications/install_service_spec.rb b/spec/services/clusters/applications/install_service_spec.rb index 2441cc595a3..d34b4dd943c 100644 --- a/spec/services/clusters/applications/install_service_spec.rb +++ b/spec/services/clusters/applications/install_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::InstallService do +RSpec.describe Clusters::Applications::InstallService do describe '#execute' do let(:application) { create(:clusters_applications_helm, :scheduled) } let!(:install_command) { application.install_command } diff --git a/spec/services/clusters/applications/patch_service_spec.rb b/spec/services/clusters/applications/patch_service_spec.rb index dc9843a5116..281da62b80b 100644 --- a/spec/services/clusters/applications/patch_service_spec.rb +++ b/spec/services/clusters/applications/patch_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::PatchService do +RSpec.describe Clusters::Applications::PatchService do describe '#execute' do let(:application) { create(:clusters_applications_knative, :scheduled) } let!(:update_command) { application.update_command } diff --git a/spec/services/clusters/applications/prometheus_config_service_spec.rb b/spec/services/clusters/applications/prometheus_config_service_spec.rb index b9032e665ec..7399f250248 100644 --- a/spec/services/clusters/applications/prometheus_config_service_spec.rb +++ b/spec/services/clusters/applications/prometheus_config_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::PrometheusConfigService do +RSpec.describe Clusters::Applications::PrometheusConfigService do include Gitlab::Routing.url_helpers let_it_be(:project) { create(:project) } diff --git a/spec/services/clusters/applications/prometheus_health_check_service_spec.rb b/spec/services/clusters/applications/prometheus_health_check_service_spec.rb index 5c4127e4938..fc5a80688e6 100644 --- a/spec/services/clusters/applications/prometheus_health_check_service_spec.rb +++ b/spec/services/clusters/applications/prometheus_health_check_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::PrometheusHealthCheckService, '#execute' do +RSpec.describe Clusters::Applications::PrometheusHealthCheckService, '#execute' do let(:service) { described_class.new(cluster) } subject { service.execute } diff --git a/spec/services/clusters/applications/prometheus_update_service_spec.rb b/spec/services/clusters/applications/prometheus_update_service_spec.rb index 078b01d2777..076ff0210c9 100644 --- a/spec/services/clusters/applications/prometheus_update_service_spec.rb +++ b/spec/services/clusters/applications/prometheus_update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::PrometheusUpdateService do +RSpec.describe Clusters::Applications::PrometheusUpdateService do describe '#execute' do let(:project) { create(:project) } let(:environment) { create(:environment, project: project) } diff --git a/spec/services/clusters/applications/schedule_update_service_spec.rb b/spec/services/clusters/applications/schedule_update_service_spec.rb index eb1006ce8e0..f559fb1b7aa 100644 --- a/spec/services/clusters/applications/schedule_update_service_spec.rb +++ b/spec/services/clusters/applications/schedule_update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::ScheduleUpdateService do +RSpec.describe Clusters::Applications::ScheduleUpdateService do describe '#execute' do let(:project) { create(:project) } diff --git a/spec/services/clusters/applications/uninstall_service_spec.rb b/spec/services/clusters/applications/uninstall_service_spec.rb index 6d7f0478b20..50d7e82c47e 100644 --- a/spec/services/clusters/applications/uninstall_service_spec.rb +++ b/spec/services/clusters/applications/uninstall_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::UninstallService, '#execute' do +RSpec.describe Clusters::Applications::UninstallService, '#execute' do let(:application) { create(:clusters_applications_prometheus, :scheduled) } let(:service) { described_class.new(application) } let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::API) } diff --git a/spec/services/clusters/applications/update_service_spec.rb b/spec/services/clusters/applications/update_service_spec.rb index 4676951faff..4c05a12a4a1 100644 --- a/spec/services/clusters/applications/update_service_spec.rb +++ b/spec/services/clusters/applications/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::UpdateService do +RSpec.describe Clusters::Applications::UpdateService do include TestRequestHelpers let(:cluster) { create(:cluster, :project, :provided_by_gcp) } diff --git a/spec/services/clusters/applications/upgrade_service_spec.rb b/spec/services/clusters/applications/upgrade_service_spec.rb index 86fb06375f1..22fbb7ca6e3 100644 --- a/spec/services/clusters/applications/upgrade_service_spec.rb +++ b/spec/services/clusters/applications/upgrade_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::UpgradeService do +RSpec.describe Clusters::Applications::UpgradeService do describe '#execute' do let(:application) { create(:clusters_applications_helm, :scheduled) } let!(:install_command) { application.install_command } |