aboutsummaryrefslogtreecommitdiffstats
path: root/t/app
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-05-17 09:55:33 +0100
committerMatthew Somerville <matthew@mysociety.org>2012-05-17 09:55:33 +0100
commit2ced346cafb7f6dcdf05d31c670c848d2658d225 (patch)
tree7f9076f2c9454df66518f7394becf9f4a35fb28a /t/app
parent8991f2967b4a82c0e6d2b8dcf836f1397d537533 (diff)
parenta9cb80973eaacc79d75cd8edb12009fc88569117 (diff)
Merge branch 'master' into barnet-newstyle
Diffstat (limited to 't/app')
-rw-r--r--t/app/controller/alert_new.t2
-rw-r--r--t/app/model/alert_type.t2
2 files changed, 2 insertions, 2 deletions
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 5ea73625a..3a4c2ef81 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -452,7 +452,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
$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 nearby problems have been added:/;
- $count++ if $_->body =~ / -\s+Testing, EH1 1BB/;
+ $count++ if $_->body =~ /\s+-\s+Testing,\s+EH1\s+1BB/;
}
is $count, 5, 'Five emails with the right things in them';
diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t
index ab129b4e7..67ddc10aa 100644
--- a/t/app/model/alert_type.t
+++ b/t/app/model/alert_type.t
@@ -202,7 +202,7 @@ for my $test (
(my $title = $report->title) =~ s/ /\\s+/;
my $body = $email->body;
- like $body, qr#report/$report_id - $title, $pc#, 'email contains expected postcode';
+ like $body, qr#report/$report_id\s+-\s+$title,\s+$pc#, 'email contains expected postcode';
};
}