Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 1 deletions

diff --git a/spec/factories/pages_domains.rb b/spec/factories/pages_domains.rb
index 91423832888..282783dee3a 100644
--- a/spec/factories/pages_domains.rb
+++ b/spec/factories/pages_domains.rb
@@ -374,5 +374,10 @@ x6zG6WoibsbsJMj70nwseUnPTBQNDP+j61RJjC/r
 -----END EC PRIVATE KEY-----'
       end
     end
+
+    trait :instance_serverless do
+      wildcard { true }
+      domain_type { :instance }
+    end
   end
 end
diff --git a/spec/factories/serverless/domain_cluster.rb b/spec/factories/serverless/domain_cluster.rb
index 24893f4a613..c44295e2405 100644
--- a/spec/factories/serverless/domain_cluster.rb
+++ b/spec/factories/serverless/domain_cluster.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :serverless_domain_cluster, class: 'Serverless::DomainCluster' do
+  factory :serverless_domain_cluster, class: '::Serverless::DomainCluster' do
     pages_domain { create(:pages_domain) }
     knative { create(:clusters_applications_knative) }
     creator { create(:user) }