feat: Always process email content (#12734)
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
This commit is contained in:
@@ -23,7 +23,7 @@ class Messages::MessageBuilder
|
|||||||
process_emails
|
process_emails
|
||||||
# When the message has no quoted content, it will just be rendered as a regular message
|
# When the message has no quoted content, it will just be rendered as a regular message
|
||||||
# The frontend is equipped to handle this case
|
# The frontend is equipped to handle this case
|
||||||
process_email_content if @account.feature_enabled?(:quoted_email_reply)
|
process_email_content
|
||||||
@message.save!
|
@message.save!
|
||||||
@message
|
@message
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -199,19 +199,6 @@ describe Messages::MessageBuilder do
|
|||||||
expect(message.content_attributes.dig('email', 'text_content', 'reply')).to eq 'Regular message content'
|
expect(message.content_attributes.dig('email', 'text_content', 'reply')).to eq 'Regular message content'
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not process custom email content when quoted_email_reply feature is disabled' do
|
|
||||||
account.disable_features('quoted_email_reply')
|
|
||||||
params = ActionController::Parameters.new({
|
|
||||||
content: 'Regular message content',
|
|
||||||
email_html_content: '<p>Custom HTML content</p>'
|
|
||||||
})
|
|
||||||
|
|
||||||
message = described_class.new(user, conversation, params).perform
|
|
||||||
|
|
||||||
expect(message.content_attributes.dig('email', 'html_content')).to be_nil
|
|
||||||
expect(message.content_attributes.dig('email', 'text_content')).to be_nil
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not process custom email content for private messages' do
|
it 'does not process custom email content for private messages' do
|
||||||
params = ActionController::Parameters.new({
|
params = ActionController::Parameters.new({
|
||||||
content: 'Regular message content',
|
content: 'Regular message content',
|
||||||
|
|||||||
Reference in New Issue
Block a user