diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2011-06-09 23:00:31 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2011-06-09 23:00:31 +0100 |
| commit | 7e844f25b99b1b2b76526a0490b5b9dea00b71df (patch) | |
| tree | 2e6c77d127719369de9bbb358d0af898fe3c65cf /t | |
| parent | 0c60b1449ce5f99e7ce6c6cd3a15b9578a833aa2 (diff) | |
Fix session cookie test, and test based on contact_name that might change.
Diffstat (limited to 't')
| -rw-r--r-- | t/app/controller/auth.t | 7 | ||||
| -rw-r--r-- | t/app/helpers/send_email.t | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t index 9a466832b..a44716a1e 100644 --- a/t/app/controller/auth.t +++ b/t/app/controller/auth.t @@ -197,9 +197,10 @@ foreach my $remember_me ( '1', '0' ) { # check that the cookie has no expiry set my $expiry = $mech->session_cookie_expiry; - $remember_me - ? cmp_ok( $expiry, '>', 86400, "long expiry time" ) - : is( $expiry, 0, "no expiry time" ); + is( $expiry, 0, "no expiry time" ); + #$remember_me + # ? cmp_ok( $expiry, '>', 86400, "long expiry time" ) + # : is( $expiry, 0, "no expiry time" ); # logout $mech->log_out_ok; diff --git a/t/app/helpers/send_email.t b/t/app/helpers/send_email.t index 5ab84e017..ac7e5b5c2 100644 --- a/t/app/helpers/send_email.t +++ b/t/app/helpers/send_email.t @@ -46,7 +46,9 @@ my $email_as_string = $emails[0]->as_string; ok $email_as_string =~ s{\s+Date:\s+\S.*?$}{}xms, "Found and stripped out date"; my $expected_email_content = file(__FILE__)->dir->file('send_email_sample.txt')->slurp; -my $sender = '"' . FixMyStreet->config('CONTACT_NAME') . '" <' . FixMyStreet->config('CONTACT_EMAIL') . '>'; +my $name = FixMyStreet->config('CONTACT_NAME'); +$name = "\"$name\"" if $name =~ / /; +my $sender = $name . ' <' . FixMyStreet->config('CONTACT_EMAIL') . '>'; $expected_email_content =~ s{CONTACT_EMAIL}{$sender}; is $email_as_string, |