Skip to content
Snippets Groups Projects
Commit a8c0ea0b authored by Naman Jagdish Gala's avatar Naman Jagdish Gala :speech_balloon:
Browse files

Rename pages_default_domain_redirect to pages_primary_domain

Related: #481334 (comment 2276384325)

Changelog: changed
parent e300ab70
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{ {
pages_unique_domain_enabled: false, pages_unique_domain_enabled: false,
pages_https_only: false, pages_https_only: false,
pages_default_domain_redirect: domain pages_primary_domain: domain
} }
end end
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
expect { service.execute } expect { service.execute }
.to change { project.reload.pages_https_only }.from(true).to(false) .to change { project.reload.pages_https_only }.from(true).to(false)
.and change { project.project_setting.pages_unique_domain_enabled }.from(true).to(false) .and change { project.project_setting.pages_unique_domain_enabled }.from(true).to(false)
.and change { project.project_setting.pages_default_domain_redirect }.from(nil).to(domain) .and change { project.project_setting.pages_primary_domain }.from(nil).to(domain)
end end
it 'returns a success response' do it 'returns a success response' do
......
...@@ -983,21 +983,21 @@ def expect_rename_of_base_repository_in_registry(dry_run:, path: nil) ...@@ -983,21 +983,21 @@ def expect_rename_of_base_repository_in_registry(dry_run:, path: nil)
context 'when selecting an existing domain' do context 'when selecting an existing domain' do
it 'updates the pages default domain redirect setting' do it 'updates the pages default domain redirect setting' do
expect { update_project(project, user, project_setting_attributes: { pages_default_domain_redirect: "http://example.com" }) } expect { update_project(project, user, project_setting_attributes: { pages_primary_domain: "http://example.com" }) }
.to change { project.project_setting.pages_default_domain_redirect } .to change { project.project_setting.pages_primary_domain }
.from(nil).to("http://example.com") .from(nil).to("http://example.com")
end end
end end
context 'when clearing the default domain redirect' do context 'when clearing the default domain redirect' do
let(:project_settings) { create(:project_setting, pages_default_domain_redirect: "http://example.com") } let(:project_settings) { create(:project_setting, pages_primary_domain: "http://example.com") }
let(:project) { build(:project, project_setting: project_settings) } let(:project) { build(:project, project_setting: project_settings) }
it 'removes the pages default domain redirect setting' do it 'removes the pages default domain redirect setting' do
expect(project.project_setting.pages_default_domain_redirect).to eq("http://example.com") expect(project.project_setting.pages_primary_domain).to eq("http://example.com")
expect { update_project(project, user, project_setting_attributes: { pages_default_domain_redirect: "" }) } expect { update_project(project, user, project_setting_attributes: { pages_primary_domain: "" }) }
.to change { project.project_setting.pages_default_domain_redirect } .to change { project.project_setting.pages_primary_domain }
.from("http://example.com").to(nil) .from("http://example.com").to(nil)
end end
end end
...@@ -1006,12 +1006,12 @@ def expect_rename_of_base_repository_in_registry(dry_run:, path: nil) ...@@ -1006,12 +1006,12 @@ def expect_rename_of_base_repository_in_registry(dry_run:, path: nil)
let(:domain_present) { false } let(:domain_present) { false }
it 'returns an error to the user' do it 'returns an error to the user' do
result = update_project(project, user, project_setting_attributes: { pages_default_domain_redirect: "http://example.com" }) result = update_project(project, user, project_setting_attributes: { pages_primary_domain: "http://example.com" })
expect(result).to include(status: :error) expect(result).to include(status: :error)
expect(result[:message]).to include(_("The `pages_default_domain_redirect` attribute is missing from the domain list in the Pages project configuration. Assign `pages_default_domain_redirect` to the Pages project or reset it.")) expect(result[:message]).to include(_("The `pages_primary_domain` attribute is missing from the domain list in the Pages project configuration. Assign `pages_primary_domain` to the Pages project or reset it."))
expect(project.project_setting.pages_default_domain_redirect).to be_nil expect(project.project_setting.pages_primary_domain).to be_nil
end end
end end
end end
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
let_it_be(:default_domain) { create(:pages_domain, project: project, domain: default_domain_url) } let_it_be(:default_domain) { create(:pages_domain, project: project, domain: default_domain_url) }
let_it_be(:non_default_domain) { create(:pages_domain, project: project, domain: non_default_domain_url) } let_it_be(:non_default_domain) { create(:pages_domain, project: project, domain: non_default_domain_url) }
let_it_be(:project_setting) do let_it_be(:project_setting) do
create(:project_setting, project: project, pages_default_domain_redirect: default_domain_url) create(:project_setting, project: project, pages_primary_domain: default_domain_url)
end end
let(:event) do let(:event) do
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
default_domain.destroy! default_domain.destroy!
expect { use_event } expect { use_event }
.to change { project.reload.project_setting.pages_default_domain_redirect } .to change { project.reload.project_setting.pages_primary_domain }
.from(default_domain_url).to(nil) .from(default_domain_url).to(nil)
end end
end end
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
non_default_domain.destroy! non_default_domain.destroy!
expect { use_event } expect { use_event }
.not_to change { project.reload.project_setting.pages_default_domain_redirect } .not_to change { project.reload.project_setting.pages_primary_domain }
end end
end end
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment