From ab4439aa44591e1f06137efc7cdb0e6a387ff86d Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Tue, 6 Jul 2021 09:25:37 +0800
Subject: [PATCH] Ignore googlefont stylesheet from premailer
We do not need to run this through premailer since the @font-face rules
cannot be inlined into the HTML elements
---
.../notify/in_product_marketing_email.html.haml | 2 +-
spec/mailers/notify_spec.rb | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/app/views/notify/in_product_marketing_email.html.haml b/app/views/notify/in_product_marketing_email.html.haml
index 45b002757e321..6382718480f01 100644
--- a/app/views/notify/in_product_marketing_email.html.haml
+++ b/app/views/notify/in_product_marketing_email.html.haml
@@ -3,7 +3,7 @@
%head
%meta{ content: "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
%meta{ content: "width=device-width, initial-scale=1", name: "viewport" }
- %link{ href: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600", rel: "stylesheet", type: "text/css" }
+ %link{ href: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600", rel: "stylesheet", type: "text/css", data: { premailer: 'ignore' } }
%title= message.subject
:css
/* CLIENT-SPECIFIC STYLES */
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 8ee8877610712..3b1694527d3bd 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -1969,6 +1969,19 @@ def invite_to_group(group, inviter:, user: nil)
end
end
+ describe 'in product marketing', :mailer do
+ let_it_be(:group) { create(:group) }
+
+ let(:mail) { ActionMailer::Base.deliveries.last }
+
+ it 'does not raise error' do
+ described_class.in_product_marketing_email(user.id, group.id, :trial, 0).deliver
+
+ expect(mail.subject).to eq('Go farther with GitLab')
+ expect(mail.body.parts.first.to_s).to include('Start a GitLab Ultimate trial today in less than one minute, no credit card required.')
+ end
+ end
+
def expect_sender(user)
sender = subject.header[:from].addrs[0]
expect(sender.display_name).to eq("#{user.name} (@#{user.username})")
--
GitLab