From 2d945e237376ef2e421ead1e6eb4f60d9ddd7da7 Mon Sep 17 00:00:00 2001 From: Ted Johansson Date: Thu, 28 Nov 2024 10:23:00 +0800 Subject: [PATCH] DEV: Enable the normalize_emails site setting by default (#29952) --- config/site_settings.yml | 2 +- spec/lib/search_spec.rb | 8 ++++---- spec/models/discourse_connect_spec.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/site_settings.yml b/config/site_settings.yml index 6f00a34b811..103c2399714 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -611,7 +611,7 @@ login: type: host_list list_type: simple normalize_emails: - default: false + default: true auto_approve_email_domains: default: "" type: host_list diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb index 51ad9cd6851..873abe21c70 100644 --- a/spec/lib/search_spec.rb +++ b/spec/lib/search_spec.rb @@ -804,11 +804,11 @@ RSpec.describe Search do end context "with all topics" do - let!(:u1) { Fabricate(:user, username: "fred", name: "bob jones", email: "foo+1@bar.baz") } - let!(:u2) { Fabricate(:user, username: "bob", name: "fred jones", email: "foo+2@bar.baz") } - let!(:u3) { Fabricate(:user, username: "jones", name: "bob fred", email: "foo+3@bar.baz") } + let!(:u1) { Fabricate(:user, username: "fred", name: "bob jones", email: "fred@bar.baz") } + let!(:u2) { Fabricate(:user, username: "bob", name: "fred jones", email: "bob@bar.baz") } + let!(:u3) { Fabricate(:user, username: "jones", name: "bob fred", email: "jones@bar.baz") } let!(:u4) do - Fabricate(:user, username: "alice", name: "bob fred", email: "foo+4@bar.baz", admin: true) + Fabricate(:user, username: "alice", name: "bob fred", email: "alice@bar.baz", admin: true) end let!(:public_topic) { Fabricate(:topic, user: u1) } diff --git a/spec/models/discourse_connect_spec.rb b/spec/models/discourse_connect_spec.rb index f525a63b61e..6d3bef714e4 100644 --- a/spec/models/discourse_connect_spec.rb +++ b/spec/models/discourse_connect_spec.rb @@ -920,7 +920,7 @@ RSpec.describe DiscourseConnect do user = sso.lookup_or_create_user(ip_address) expect(user.active).to eq(true) - user.primary_email.update_columns(email: "xXx@themovie.com") + user.primary_email.update(email: "xXx@themovie.com") user = sso.lookup_or_create_user(ip_address) expect(user.email).to eq(old_email)