Add latest changes from gitlab-org/gitlab@master

7 files changed, 15 insertions, 15 deletions

diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index 8858675c2b8..ff9fc882dcc 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :clusters_applications_helm, class: Clusters::Applications::Helm do
+  factory :clusters_applications_helm, class: 'Clusters::Applications::Helm' do
     cluster factory: %i(cluster provided_by_gcp)
 
     before(:create) do
@@ -70,40 +70,40 @@ FactoryBot.define do
       updated_at { ClusterWaitForAppInstallationWorker::TIMEOUT.ago }
     end
 
-    factory :clusters_applications_ingress, class: Clusters::Applications::Ingress do
+    factory :clusters_applications_ingress, class: 'Clusters::Applications::Ingress' do
       modsecurity_enabled { false }
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
 
-    factory :clusters_applications_cert_manager, class: Clusters::Applications::CertManager do
+    factory :clusters_applications_cert_manager, class: 'Clusters::Applications::CertManager' do
       email { 'admin@example.com' }
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
 
-    factory :clusters_applications_elastic_stack, class: Clusters::Applications::ElasticStack do
+    factory :clusters_applications_elastic_stack, class: 'Clusters::Applications::ElasticStack' do
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
 
-    factory :clusters_applications_crossplane, class: Clusters::Applications::Crossplane do
+    factory :clusters_applications_crossplane, class: 'Clusters::Applications::Crossplane' do
       stack { 'gcp' }
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
 
-    factory :clusters_applications_prometheus, class: Clusters::Applications::Prometheus do
+    factory :clusters_applications_prometheus, class: 'Clusters::Applications::Prometheus' do
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
 
-    factory :clusters_applications_runner, class: Clusters::Applications::Runner do
+    factory :clusters_applications_runner, class: 'Clusters::Applications::Runner' do
       runner factory: %i(ci_runner)
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
 
-    factory :clusters_applications_knative, class: Clusters::Applications::Knative do
+    factory :clusters_applications_knative, class: 'Clusters::Applications::Knative' do
       hostname { 'example.com' }
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
 
-    factory :clusters_applications_jupyter, class: Clusters::Applications::Jupyter do
+    factory :clusters_applications_jupyter, class: 'Clusters::Applications::Jupyter' do
       oauth_application factory: :oauth_application
       cluster factory: %i(cluster with_installed_helm provided_by_gcp project)
     end
diff --git a/spec/factories/clusters/clusters.rb b/spec/factories/clusters/clusters.rb
index 7121850e5ff..843f87ef7d6 100644
--- a/spec/factories/clusters/clusters.rb
+++ b/spec/factories/clusters/clusters.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :cluster, class: Clusters::Cluster do
+  factory :cluster, class: 'Clusters::Cluster' do
     user
     name { 'test-cluster' }
     cluster_type { :project_type }
diff --git a/spec/factories/clusters/kubernetes_namespaces.rb b/spec/factories/clusters/kubernetes_namespaces.rb
index 75895e1c020..c820bf4da60 100644
--- a/spec/factories/clusters/kubernetes_namespaces.rb
+++ b/spec/factories/clusters/kubernetes_namespaces.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :cluster_kubernetes_namespace, class: Clusters::KubernetesNamespace do
+  factory :cluster_kubernetes_namespace, class: 'Clusters::KubernetesNamespace' do
     association :cluster, :project, :provided_by_gcp
 
     after(:build) do |kubernetes_namespace|
diff --git a/spec/factories/clusters/platforms/kubernetes.rb b/spec/factories/clusters/platforms/kubernetes.rb
index dbcb838e9da..822457adaef 100644
--- a/spec/factories/clusters/platforms/kubernetes.rb
+++ b/spec/factories/clusters/platforms/kubernetes.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :cluster_platform_kubernetes, class: Clusters::Platforms::Kubernetes do
+  factory :cluster_platform_kubernetes, class: 'Clusters::Platforms::Kubernetes' do
     association :cluster, platform_type: :kubernetes, provider_type: :user
     namespace { nil }
     api_url { 'https://kubernetes.example.com' }
diff --git a/spec/factories/clusters/projects.rb b/spec/factories/clusters/projects.rb
index 6cda77c6f85..e980279cad9 100644
--- a/spec/factories/clusters/projects.rb
+++ b/spec/factories/clusters/projects.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :cluster_project, class: Clusters::Project do
+  factory :cluster_project, class: 'Clusters::Project' do
     cluster
     project
   end
diff --git a/spec/factories/clusters/providers/aws.rb b/spec/factories/clusters/providers/aws.rb
index e4b10aa5f33..2c54300e606 100644
--- a/spec/factories/clusters/providers/aws.rb
+++ b/spec/factories/clusters/providers/aws.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :cluster_provider_aws, class: Clusters::Providers::Aws do
+  factory :cluster_provider_aws, class: 'Clusters::Providers::Aws' do
     association :cluster, platform_type: :kubernetes, provider_type: :aws
 
     role_arn { 'arn:aws:iam::123456789012:role/role-name' }
diff --git a/spec/factories/clusters/providers/gcp.rb b/spec/factories/clusters/providers/gcp.rb
index 216c4d4fa31..c99f4407b42 100644
--- a/spec/factories/clusters/providers/gcp.rb
+++ b/spec/factories/clusters/providers/gcp.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :cluster_provider_gcp, class: Clusters::Providers::Gcp do
+  factory :cluster_provider_gcp, class: 'Clusters::Providers::Gcp' do
     association :cluster, platform_type: :kubernetes, provider_type: :gcp
     gcp_project_id { 'test-gcp-project' }