chore: Improve email parsing using email trimmer gem (#3611)
Email parsing using email_trimmer gem Fixes: #3539 , #2954, #3572
This commit is contained in:
47
spec/fixtures/files/mail_with_quote.eml
vendored
Normal file
47
spec/fixtures/files/mail_with_quote.eml
vendored
Normal file
@@ -0,0 +1,47 @@
|
||||
MIME-Version: 1.0
|
||||
Date: Thu, 19 Aug 2021 14:14:31 +0530
|
||||
References: <CAFkiBVxGoURoqdkY-O_25F-8b41kb-GWBc6hh4Djd5ynwOikXA@mail.gmail.com> <0100017b5d8efc70-c7f18809-aa55-48f6-91fd-b626092ed8b3-000000@email.amazonses.com>
|
||||
In-Reply-To: <0100017b5d8efc70-c7f18809-aa55-48f6-91fd-b626092ed8b3-000000@email.amazonses.com>
|
||||
Message-ID: <CAFkiBVwJjO_k_e-LpiKi7MAQAKbHX5nkEPcf0y1R=bjcEHogMg@mail.gmail.com>
|
||||
Subject: Re: Checking mail forwarding to cw inbox
|
||||
From: Sony Mathew <sony@chatwoot.com>
|
||||
To: Tejaswini <reply+6bdc3f4d-0bec-4515-a284-5d916fdde489@example.com>
|
||||
Content-Type: multipart/alternative; boundary="0000000000004af64505c9e58f03"
|
||||
|
||||
--0000000000004af64505c9e58f03
|
||||
Content-Type: text/plain; charset="UTF-8"
|
||||
|
||||
Yes, I am providing you step how to reproduce this issue
|
||||
|
||||
On Thu, Aug 19, 2021 at 2:07 PM Tejaswini from Email sender test <
|
||||
tejaswini@chatwoot.com> wrote:
|
||||
|
||||
> Any update on this?
|
||||
>
|
||||
>
|
||||
|
||||
--
|
||||
* Sony Mathew*
|
||||
Software developer
|
||||
*Mob:9999999999
|
||||
|
||||
--0000000000004af64505c9e58f03
|
||||
Content-Type: text/html; charset="UTF-8"
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
|
||||
<div dir=3D"ltr">Yes, I am providing you step how to reproduce this issue</=
|
||||
div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On=
|
||||
Thu, Aug 19, 2021 at 2:07 PM Tejaswini from Email sender test &l=
|
||||
t;<a href=3D"mailto:tejaswini@chatwoot.com">tejaswini@chatwoot.com</a>> wrot=
|
||||
e:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0=
|
||||
.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <p>
|
||||
</p><p>Any update on this?</p>
|
||||
|
||||
<p></p>
|
||||
</blockquote></div><br clear=3D"all"><div><br></div>-- <br><div dir=3D"ltr"=
|
||||
class=3D"gmail_signature"><div dir=3D"ltr"><div><div dir=3D"ltr"><div><div=
|
||||
><b>Sony Mathew.</b><br></div><span style=3D"font-family:"times ne=
|
||||
w roman",serif"><span></span><span></span>Software developer</span><br=
|
||||
></div><b>Mob:9999999999</b></div></div></div></div>
|
||||
|
||||
--0000000000004af64505c9e58f03--
|
||||
1061
spec/fixtures/files/welcome_html.eml
vendored
Normal file
1061
spec/fixtures/files/welcome_html.eml
vendored
Normal file
File diff suppressed because it is too large
Load Diff
@@ -7,6 +7,7 @@ RSpec.describe ReplyMailbox, type: :mailbox do
|
||||
let(:account) { create(:account) }
|
||||
let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
|
||||
let(:reply_mail) { create_inbound_email_from_fixture('reply.eml') }
|
||||
let(:mail_with_quote) { create_inbound_email_from_fixture('mail_with_quote.eml') }
|
||||
let(:conversation) { create(:conversation, assignee: agent, inbox: create(:inbox, account: account, greeting_enabled: false), account: account) }
|
||||
let(:described_subject) { described_class.receive reply_mail }
|
||||
let(:serialized_attributes) do
|
||||
@@ -95,5 +96,35 @@ RSpec.describe ReplyMailbox, type: :mailbox do
|
||||
expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
|
||||
end
|
||||
end
|
||||
|
||||
context 'with quotes in email' do
|
||||
let(:described_subject) { described_class.receive mail_with_quote }
|
||||
|
||||
before do
|
||||
# this UUID is hardcoded in the reply.eml, that's why we are updating this
|
||||
conversation.uuid = '6bdc3f4d-0bec-4515-a284-5d916fdde489'
|
||||
conversation.save
|
||||
end
|
||||
|
||||
it 'add the mail content as new message on the conversation' do
|
||||
described_subject
|
||||
expect(conversation.messages.last.content).to eq(
|
||||
<<-BODY.strip_heredoc.chomp
|
||||
Yes, I am providing you step how to reproduce this issue
|
||||
|
||||
On Thu, Aug 19, 2021 at 2:07 PM Tejaswini from Email sender test < tejaswini@chatwoot.com> wrote:
|
||||
|
||||
> Any update on this?
|
||||
>
|
||||
>
|
||||
|
||||
--
|
||||
* Sony Mathew*
|
||||
Software developer
|
||||
*Mob:9999999999
|
||||
BODY
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
15
spec/presenters/html_parser_spec.rb
Normal file
15
spec/presenters/html_parser_spec.rb
Normal file
@@ -0,0 +1,15 @@
|
||||
require 'rails_helper'
|
||||
RSpec.describe HtmlParser do
|
||||
include ActionMailbox::TestHelper
|
||||
|
||||
describe 'parsed mail decorator' do
|
||||
let(:html_mail) { create_inbound_email_from_fixture('welcome_html.eml').mail }
|
||||
|
||||
it 'parse html content in the mail' do
|
||||
decorated_html_mail = described_class.parse_reply(html_mail.text_part.decoded)
|
||||
expect(decorated_html_mail[0..70]).to eq(
|
||||
"I'm learning English as a first language for the past 13 years, but to "
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -4,6 +4,7 @@ RSpec.describe MailPresenter do
|
||||
|
||||
describe 'parsed mail decorator' do
|
||||
let(:mail) { create_inbound_email_from_fixture('welcome.eml').mail }
|
||||
let(:html_mail) { create_inbound_email_from_fixture('welcome_html.eml').mail }
|
||||
let(:decorated_mail) { described_class.new(mail) }
|
||||
|
||||
let(:mail_with_no_subject) { create_inbound_email_from_fixture('mail_with_no_subject.eml').mail }
|
||||
@@ -56,5 +57,13 @@ RSpec.describe MailPresenter do
|
||||
it 'give email from in downcased format' do
|
||||
expect(decorated_mail.from.first.eql?(mail.from.first.downcase)).to eq true
|
||||
end
|
||||
|
||||
it 'parse html content in the mail' do
|
||||
decorated_html_mail = described_class.new(html_mail)
|
||||
expect(decorated_html_mail.subject).to eq('Fwd: How good are you in English? How did you improve your English?')
|
||||
expect(decorated_html_mail.text_content[:reply][0..70]).to eq(
|
||||
"I'm learning English as a first language for the past 13 years, but to "
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user