IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 02:11:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "DEV: Enable the normalize_emails site setting by default (#29587)" (#29712)

Browse Source 
This reverts commit 7d9d98422c.
This commit is contained in:
Martin Brennan 2024-11-12 10:23:02 +10:00 committed by GitHub
parent 0a0b490743
commit 7f1e403a25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/site_settings.yml
View File

@ -611,7 +611,7 @@ login:
type: host_list type: host_list
list_type: simple list_type: simple
normalize_emails: normalize_emails:
default: true default: false
auto_approve_email_domains: auto_approve_email_domains:
default: "" default: ""
type: host_list type: host_list

8
spec/lib/search_spec.rb
View File

@ -804,11 +804,11 @@ RSpec.describe Search do
end end
context "with all topics" do context "with all topics" do
let!(:u1) { Fabricate(:user, username: "fred", name: "bob jones", email: "fred@bar.baz") } let!(:u1) { Fabricate(:user, username: "fred", name: "bob jones", email: "foo+1@bar.baz") }
let!(:u2) { Fabricate(:user, username: "bob", name: "fred jones", email: "bob@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: "jones@bar.baz") } let!(:u3) { Fabricate(:user, username: "jones", name: "bob fred", email: "foo+3@bar.baz") }
let!(:u4) do let!(:u4) do
Fabricate(:user, username: "alice", name: "bob fred", email: "alice@bar.baz", admin: true) Fabricate(:user, username: "alice", name: "bob fred", email: "foo+4@bar.baz", admin: true)
end end
let!(:public_topic) { Fabricate(:topic, user: u1) } let!(:public_topic) { Fabricate(:topic, user: u1) }

2
spec/models/discourse_connect_spec.rb
View File

@ -904,7 +904,7 @@ RSpec.describe DiscourseConnect do
user = sso.lookup_or_create_user(ip_address) user = sso.lookup_or_create_user(ip_address)
expect(user.active).to eq(true) expect(user.active).to eq(true)
user.primary_email.update(email: "xXx@themovie.com") user.primary_email.update_columns(email: "xXx@themovie.com")
user = sso.lookup_or_create_user(ip_address) user = sso.lookup_or_create_user(ip_address)
expect(user.email).to eq(old_email) expect(user.email).to eq(old_email)