IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Address TODOs for email Message-ID generation (#19842)

Browse Source 
Remove some old deprecated methods and update docs. Will leave
the backwards-compatible Message-ID formats a little while longer
just to be sure.
This commit is contained in:
Martin Brennan
2023-01-12 13:54:15 +10:00
committed by GitHub
parent 421fbfd1c7
commit 1f59a8299d
2 changed files with 15 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
spec/lib/message_id_service_spec.rb
View File

@@ -7,69 +7,6 @@ RSpec.describe Email::MessageIdService do
subject { described_class }
describe "#generate_for_post" do
it "generates for the post using the message_id on the post's incoming_email" do
Fabricate(:incoming_email, message_id: "test@test.localhost", post: post)
post.reload
expect(subject.generate_for_post(post, use_incoming_email_if_present: true)).to eq(
"<test@test.localhost>",
)
end
it "generates for the post without an incoming_email record" do
expect(subject.generate_for_post(post)).to match(subject.message_id_post_id_regexp)
expect(subject.generate_for_post(post, use_incoming_email_if_present: true)).to match(
subject.message_id_post_id_regexp,
)
end
end
describe "#generate_for_topic" do
it "generates for the topic using the message_id on the first post's incoming_email" do
Fabricate(
:incoming_email,
message_id: "test213428@somemailservice.com",
post: post,
created_via: IncomingEmail.created_via_types[:handle_mail],
)
post.reload
expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to eq(
"<test213428@somemailservice.com>",
)
end
it "does not use the first post's incoming email if it was created via group_smtp, only handle_mail" do
incoming =
Fabricate(
:incoming_email,
message_id: "test213428@somemailservice.com",
post: post,
created_via: IncomingEmail.created_via_types[:group_smtp],
)
post.reload
expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to match(
subject.message_id_topic_id_regexp,
)
incoming.update(created_via: IncomingEmail.created_via_types[:handle_mail])
expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to eq(
"<test213428@somemailservice.com>",
)
end
it "generates for the topic without an incoming_email record" do
expect(subject.generate_for_topic(topic)).to match(subject.message_id_topic_id_regexp)
expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to match(
subject.message_id_topic_id_regexp,
)
end
it "generates canonical for the topic" do
canonical_topic_id = subject.generate_for_topic(topic, canonical: true)
expect(canonical_topic_id).to match(subject.message_id_topic_id_regexp)
expect(canonical_topic_id).to eq("<topic/#{topic.id}@test.localhost>")
end
end
describe "#generate_or_use_existing" do
it "does not override a post's existing outbound_message_id" do
post.update!(outbound_message_id: "blah@host.test")