diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-03-15 13:29:42 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-03-23 08:56:06 +0000 |
| commit | cb49284dc0503b2a05ca2bb98b8a1320431c2616 (patch) | |
| tree | be4ddb1fc16cf45b67e3cf0683506a493de4b27e /perllib/FixMyStreet/TestMech.pm | |
| parent | d3d0ab6d5a753d1e5c8277db981f03823683ae1f (diff) | |
Updates to cpanfile and code for perl 5.20/5.22.
The following modules had bugs that have been fixed for working in
recent perls:
* List::MoreUtils
* Guard
* PadWalker
* aliased
* URI
* Convert::NLS_DATE_FORMAT
The CGI module was removed from core in 5.20, so include it in the
snapshot (I don't think it's actually used, but is a dependency).
"{" needs to be escaped in regular expressions, and ~~ should not be
used.
Fix some tests that expect e.g. a certain hash ordering, to use sorted
output or better comparisons.
Diffstat (limited to 'perllib/FixMyStreet/TestMech.pm')
| -rw-r--r-- | perllib/FixMyStreet/TestMech.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm index 9d836ca4d..f3ee7787b 100644 --- a/perllib/FixMyStreet/TestMech.pm +++ b/perllib/FixMyStreet/TestMech.pm @@ -234,8 +234,8 @@ sub get_first_email { my $mech = shift; my $email = shift or do { fail 'No email retrieved'; return }; my $email_as_string = $email->as_string; - ok $email_as_string =~ s{\s+Date:\s+\S.*?$}{}xmsg, "Found and stripped out date"; - ok $email_as_string =~ s{\s+Message-ID:\s+\S.*?$}{}xmsg, "Found and stripped out message ID (contains epoch)"; + ok $email_as_string =~ s{^Date:\s+\S.*?\r?\n}{}xmsg, "Found and stripped out date"; + ok $email_as_string =~ s{^Message-ID:\s+\S.*?\r?\n}{}xmsg, "Found and stripped out message ID (contains epoch)"; return $email_as_string; } |