From 1820db45188fd62699223f63167c5f7250d1b7a6 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 15 Jul 2016 18:31:52 +0100 Subject: Add HTML email templates. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Design is all Zarino. This adds the ability to send HTML emails, including attached inline images. When included, this is done as a multipart/related email containing a multipart/alternative (of plain and HTML) and any attached images, so that the images are available even if HTML mail is not. The alert emails list data has been improved so it can be constructed in the templates rather than the code. Various templates have been tidied. Various workarounds for email clients have been made, including: * is used so that the Android 4.x mail client can give them `block` styling in the small screen media query. * Font settings defined on every table cell () so that sans-serif fonts are used in Outlook, rather than Times New Roman. * A three-column wrapper table to create a 620px centred content area that also shrinks down on narrow screens. (Outlook doesn’t like max-width, so this is the simplest alternative.) * Enforcing a sensible (500px) min-width for the main content area, on clients that don’t support media queries (eg: native Gmail app). * Giant borders on buttons so Outlook displays them * Image alignment with align rather than float. --- t/app/controller/auth_social.t | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 't/app/controller/auth_social.t') diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t index 6929c0ddc..f3eae32a7 100644 --- a/t/app/controller/auth_social.t +++ b/t/app/controller/auth_social.t @@ -113,10 +113,8 @@ for my $fb_state ( 'refused', 'no email', 'existing UID', 'okay' ) { $mech->submit_form(with_fields => $fields); $mech->content_contains('Nearly done! Now check your email'); - my $email = $mech->get_email; - ok $email, "got an email"; + my $url = $mech->get_link_from_email; $mech->clear_emails_ok; - my ( $url, $url_token ) = $email->body =~ m{(https?://\S+/[CMP]/)(\S+)}; ok $url, "extracted confirm url '$url'"; my $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $fb_email } ); @@ -125,7 +123,7 @@ for my $fb_state ( 'refused', 'no email', 'existing UID', 'okay' ) { } else { is $user->facebook_id, undef, 'User has no facebook ID'; } - $mech->get_ok( $url . $url_token ); + $mech->get_ok( $url ); $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $fb_email } ); is $user->facebook_id, $fb_uid, 'User now has correct facebook ID'; @@ -225,10 +223,8 @@ for my $tw_state ( 'refused', 'existing UID', 'no email' ) { $mech->submit_form(with_fields => $fields); $mech->content_contains('Nearly done! Now check your email'); - my $email = $mech->get_email; - ok $email, "got an email"; + my $url = $mech->get_link_from_email; $mech->clear_emails_ok; - my ( $url, $url_token ) = $email->body =~ m{(https?://\S+/[CMP]/)(\S+)}; ok $url, "extracted confirm url '$url'"; my $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $tw_email } ); @@ -237,7 +233,7 @@ for my $tw_state ( 'refused', 'existing UID', 'no email' ) { } else { is $user->twitter_id, undef, 'User has no twitter ID'; } - $mech->get_ok( $url . $url_token ); + $mech->get_ok( $url ); $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $tw_email } ); is $user->twitter_id, $tw_uid, 'User now has correct twitter ID'; -- cgit v1.2.3