Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 2e8d22cb9db..a39a8d18207 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -1962,7 +1962,7 @@ RSpec.describe Namespace do
     it 'returns the virual domain' do
       expect(virtual_domain).to be_an_instance_of(Pages::VirtualDomain)
       expect(virtual_domain.lookup_paths).not_to be_empty
-      expect(virtual_domain.cache_key).to eq("pages_domain_for_namespace_#{namespace.root_ancestor.id}")
+      expect(virtual_domain.cache_key).to match(/pages_domain_for_namespace_#{namespace.root_ancestor.id}_/)
     end
 
     context 'when :cache_pages_domain_api is disabled' do
diff --git a/spec/models/pages_domain_spec.rb b/spec/models/pages_domain_spec.rb
index b50bfaed528..463ec904e9a 100644
--- a/spec/models/pages_domain_spec.rb
+++ b/spec/models/pages_domain_spec.rb
@@ -563,7 +563,7 @@ RSpec.describe PagesDomain do
       it 'returns the virual domain when there are pages deployed for the project' do
         expect(virtual_domain).to be_an_instance_of(Pages::VirtualDomain)
         expect(virtual_domain.lookup_paths).not_to be_empty
-        expect(virtual_domain.cache_key).to eq("pages_domain_for_project_#{project.id}")
+        expect(virtual_domain.cache_key).to match(/pages_domain_for_project_#{project.id}_/)
       end
 
       context 'when :cache_pages_domain_api is disabled' do