Skip to content

FIX: Simplify full name requirement logic during signup #34215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/site.rb
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,10 @@ def self.clear_anon_cache!
end

def self.full_name_required_for_signup
SiteSetting.enable_names && SiteSetting.full_name_requirement == "required_at_signup"
SiteSetting.full_name_requirement == "required_at_signup"
end

def self.full_name_visible_in_signup
SiteSetting.enable_names && SiteSetting.full_name_requirement != "hidden_at_signup"
SiteSetting.full_name_requirement != "hidden_at_signup"
end
end
25 changes: 1 addition & 24 deletions spec/serializers/site_serializer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -433,15 +433,8 @@
described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
end

it "is false when enable_names setting is false" do
SiteSetting.full_name_requirement = "required_at_signup"
SiteSetting.enable_names = false
expect(site_json[:full_name_required_for_signup]).to eq(false)
end

it "is false when full_name_requirement setting is optional_at_signup" do
SiteSetting.full_name_requirement = "optional_at_signup"
SiteSetting.enable_names = true
expect(site_json[:full_name_required_for_signup]).to eq(false)
end

Expand All @@ -463,39 +456,23 @@
described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
end

it "is false when enable_names setting is false and full_name_requirement is hidden_at_signup" do
it "is false when full_name_requirement is hidden_at_signup" do
SiteSetting.full_name_requirement = "hidden_at_signup"
SiteSetting.enable_names = false
expect(site_json[:full_name_visible_in_signup]).to eq(false)
end

it "is false when enable_names setting is false and full_name_requirement is required_at_signup" do
SiteSetting.full_name_requirement = "required_at_signup"
SiteSetting.enable_names = false
expect(site_json[:full_name_visible_in_signup]).to eq(false)
end

it "is false when enable_names setting is false and full_name_requirement is optional_at_signup" do
SiteSetting.full_name_requirement = "optional_at_signup"
SiteSetting.enable_names = false
expect(site_json[:full_name_visible_in_signup]).to eq(false)
end

it "is true when enable_names setting is true and full_name_requirement is optional_at_signup" do
SiteSetting.full_name_requirement = "optional_at_signup"
SiteSetting.enable_names = true
expect(site_json[:full_name_visible_in_signup]).to eq(true)
end

it "is true when enable_names setting is true and full_name_requirement is required_at_signup" do
SiteSetting.full_name_requirement = "required_at_signup"
SiteSetting.enable_names = true
expect(site_json[:full_name_visible_in_signup]).to eq(true)
end

it "is false when enable_names setting is true and full_name_requirement is hidden_at_signup" do
SiteSetting.full_name_requirement = "hidden_at_signup"
SiteSetting.enable_names = true
expect(site_json[:full_name_visible_in_signup]).to eq(false)
end
end
Expand Down
4 changes: 2 additions & 2 deletions spec/system/signup_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@

it "hides the name field" do
signup_page.open
expect(signup_page).to have_no_name_input
expect(signup_page).to have_name_input
end
end
end
Expand All @@ -370,7 +370,7 @@

it "hides the name field" do
signup_page.open
expect(signup_page).to have_no_name_input
expect(signup_page).to have_name_input
end
end
end
Expand Down
Loading