diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2014-03-17 18:39:24 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2014-03-17 19:04:25 +0000 |
| commit | 36f50c1e21ef26f0021036568254e70863bdb0cc (patch) | |
| tree | b7cf3213cbe2e55989a2a336945477319046844a /t/app | |
| parent | c5715d14de77d3bbcd144592175c4814eb19bbc8 (diff) | |
Change default email indentation to none.
This is very old, no-one seems to want/need it any more,
and more than one reuser does not want it. Fixes #715.
Diffstat (limited to 't/app')
| -rw-r--r-- | t/app/controller/alert_new.t | 2 | ||||
| -rw-r--r-- | t/app/controller/questionnaire.t | 3 | ||||
| -rw-r--r-- | t/app/helpers/send_email_sample.txt | 29 |
3 files changed, 17 insertions, 17 deletions
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t index 1804da32e..532b071eb 100644 --- a/t/app/controller/alert_new.t +++ b/t/app/controller/alert_new.t @@ -451,7 +451,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub { my $count; for (@emails) { $count++ if $_->body =~ /The following updates have been left on this problem:/; - $count++ if $_->body =~ /The following new problems have been reported to City of\s*Edinburgh Council:/; + $count++ if $_->body =~ /The following new problems have been reported to City of\s+Edinburgh\s+Council:/; $count++ if $_->body =~ /The following nearby problems have been added:/; $count++ if $_->body =~ /\s+-\s+Testing/; } diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t index 3468909b9..6ee7ba58f 100644 --- a/t/app/controller/questionnaire.t +++ b/t/app/controller/questionnaire.t @@ -401,7 +401,8 @@ FixMyStreet::override_config { ok $email, "got an email"; $mech->clear_emails_ok; - like $email->body, qr/fill in this short questionnaire/i, "got questionnaire email"; + (my $body = $email->body) =~ s/\s+/ /g; + like $body, qr/fill in this short questionnaire/i, "got questionnaire email"; ($token) = $email->body =~ m{http://.*?/Q/(\S+)}; ok $token, "extracted questionnaire token '$token'"; diff --git a/t/app/helpers/send_email_sample.txt b/t/app/helpers/send_email_sample.txt index 2fe5272cb..1ccce6a23 100644 --- a/t/app/helpers/send_email_sample.txt +++ b/t/app/helpers/send_email_sample.txt @@ -5,25 +5,24 @@ To: test@recipient.com Content-Transfer-Encoding: quoted-printable From: CONTACT_EMAIL - Hello, +Hello, - This is a test email where foo: bar. +This is a test email where foo: bar. - utf8: =E6=88=91=E4=BB=AC=E5=BA=94=E8=AF=A5=E8=83=BD=E5=A4=9F=E6=97=A0= -=E7=BC=9D=E5=A4=84=E7=90=86UTF8=E7=BC=96=E7=A0=81 +utf8: =E6=88=91=E4=BB=AC=E5=BA=94=E8=AF=A5=E8=83=BD=E5=A4=9F=E6=97=A0=E7=BC= +=9D=E5=A4=84=E7=90=86UTF8=E7=BC=96=E7=A0=81 - indented_text + indented_text - long line: Lorem ipsum dolor sit amet, consectetur adipisicing - elit, sed do eiusmod tempor incididunt ut labore et dolore - magna aliqua. Ut enim ad minim veniam, quis nostrud - exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate - velit esse cillum dolore eu fugiat nulla pariatur. Excepteur - sint occaecat cupidatat non proident, sunt in culpa qui officia - deserunt mollit anim id est laborum. +long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit, +sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris +nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in +reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla +pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. - Yours,=20=20 - FixMyStreet.=20= +Yours,=20=20 +FixMyStreet.=20= |