Merge branch 'ngala/fix-pages-redirect-worker' into 'master'

Fix: Removing all domains does not reset primary domain

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/181150



Merged-by: Piotr Skorupa <pskorupa@gitlab.com>
Approved-by: Alisa Frunza <afrunza@gitlab.com>
Approved-by: Piotr Skorupa <pskorupa@gitlab.com>
Reviewed-by: Alisa Frunza <afrunza@gitlab.com>
Co-authored-by: ngala <ngala@gitlab.com>

app/workers/pages/reset_pages_default_domain_redirect_worker.rb

@@ -13,7 +13,9 @@ def handle_event(event)
 
       return unless project_settings
       return unless project_settings.pages_primary_domain
-      return unless event.data['domain'] == project_settings.pages_primary_domain
+
+      primary_domain = URI.parse(project_settings.pages_primary_domain).host
+      return unless event.data['domain'] == primary_domain
 
       project_settings.update!(pages_primary_domain: nil)
     end

spec/workers/pages/reset_pages_default_domain_redirect_worker_spec.rb

@@ -4,12 +4,13 @@
 
 RSpec.describe Pages::ResetPagesDefaultDomainRedirectWorker, feature_category: :pages do
   let_it_be_with_reload(:project) { create(:project) }
+  let_it_be(:primary_domain_url_with_scheme) { 'https://primary.domain.com' }
   let_it_be(:primary_domain_url) { 'primary.domain.com' }
   let_it_be(:non_primary_domain_url) { 'non-primary.domain.com' }
   let_it_be(:primary_domain) { create(:pages_domain, project: project, domain: primary_domain_url) }
   let_it_be(:non_primary_domain) { create(:pages_domain, project: project, domain: non_primary_domain_url) }
   let_it_be(:project_setting) do
-    create(:project_setting, project: project, pages_primary_domain: primary_domain_url)
+    create(:project_setting, project: project, pages_primary_domain: primary_domain_url_with_scheme)
   end
 
   let(:event) do
@@ -33,7 +34,7 @@
 
       expect { use_event }
         .to change { project.reload.project_setting.pages_primary_domain }
-              .from(primary_domain_url).to(nil)
+              .from(primary_domain_url_with_scheme).to(nil)
     end
   end