github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 11:23:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: do not prefill default site title value on wizard introduction step (#18496)

Browse Source
This commit is contained in:
Arpit Jalan 2022-10-06 12:02:48 +05:30 committed by GitHub
parent 6d7abc1c85
commit 8ae1edeb79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/wizard/builder.rb
View File

@ -13,7 +13,7 @@ class Wizard
@wizard.append_step('introduction') do |step|
step.banner = "welcome-illustration"
step.add_field(id: 'title', type: 'text', required: true, value: SiteSetting.title)
step.add_field(id: 'title', type: 'text', required: true, value: SiteSetting.title == SiteSetting.defaults[:title] ? "" : SiteSetting.title)
step.add_field(id: 'site_description', type: 'text', required: false, value: SiteSetting.site_description)
step.add_field(id: 'contact_email', type: 'text', required: true, value: SiteSetting.contact_email)

36
spec/lib/wizard/wizard_builder_spec.rb
View File

@ -32,6 +32,42 @@ RSpec.describe Wizard::Builder do
expect(wizard.steps).to be_blank
end
describe 'introduction' do
let(:introduction_step) { wizard.steps.find { |s| s.id == 'introduction' } }
it 'should not prefill default site setting values' do
fields = introduction_step.fields
title_field = fields.first
description_field = fields.second
contact_email_field = fields.third
expect(title_field.id).to eq('title')
expect(title_field.value).to eq("")
expect(description_field.id).to eq('site_description')
expect(description_field.value).to eq("")
expect(contact_email_field.id).to eq('contact_email')
expect(contact_email_field.value).to eq("")
end
it 'should prefill overridden site setting values' do
SiteSetting.title = "foobar"
SiteSetting.site_description = "lorem ipsum"
SiteSetting.contact_email = "foobar@example.com"
fields = introduction_step.fields
title_field = fields.first
description_field = fields.second
contact_email_field = fields.third
expect(title_field.id).to eq('title')
expect(title_field.value).to eq("foobar")
expect(description_field.id).to eq('site_description')
expect(description_field.value).to eq("lorem ipsum")
expect(contact_email_field.id).to eq('contact_email')
expect(contact_email_field.value).to eq("foobar@example.com")
end
end
describe 'privacy step' do
let(:privacy_step) { wizard.steps.find { |s| s.id == 'privacy' } }