diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-01-28 11:52:39 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-01-28 11:52:39 +0000 |
| commit | 441debff0a773697859c528abbafbe2dd08cbd97 (patch) | |
| tree | 408c7fefb2caa24feb666c98ed1dcec35bc53263 /t/app/controller/report_new.t | |
| parent | 086031a5396c02c1d4cb96ad69e648aacd92df45 (diff) | |
Improve tests to not assume BASE_URL is localhost, and remove couple of warnings.
Diffstat (limited to 't/app/controller/report_new.t')
| -rw-r--r-- | t/app/controller/report_new.t | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 6cfa67116..0206feed3 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -1084,7 +1084,6 @@ SKIP: { desc => 'confirm link for cobrand council in two tier cobrand links to cobrand site', category => 'Trees', council => 2434, - link_base => 'http://lichfielddc.localhost/', national => 0, button => 'submit_register', }, @@ -1092,7 +1091,6 @@ SKIP: { desc => 'confirm link for non cobrand council in two tier cobrand links to national site', category => 'Street Lighting', council => 2240, - link_base => 'http://localhost/', national => 1, button => 'submit_register', }, @@ -1100,7 +1098,6 @@ SKIP: { desc => 'confirm redirect for cobrand council in two tier cobrand redirects to cobrand site', category => 'Trees', council => 2434, - link_base => 'lichfielddc.localhost', national => 0, redirect => 1, }, @@ -1108,7 +1105,6 @@ SKIP: { desc => 'confirm redirect for non cobrand council in two tier cobrand redirect to national site', category => 'Street Lighting', council => 2240, - link_base => 'localhost', national => 1, redirect => 1, }, @@ -1163,7 +1159,10 @@ SKIP: { if ( $test->{redirect} ) { is $mech->uri->path, "/report/" . $report->id, "redirected to report page"; - is $mech->uri->host, $test->{link_base}, 'redirected to correct site'; + my $base = FixMyStreet->config('BASE_URL'); + $base =~ s{http://}{}; + $base = "lichfielddc.$base" unless $test->{national}; + is $mech->uri->host, $base, 'redirected to correct site'; } else { # receive token my $email = $mech->get_email; @@ -1176,7 +1175,9 @@ SKIP: { # confirm token $mech->get_ok($url); - $mech->content_contains( $test->{link_base} . 'report/' . + my $base = FixMyStreet->config('BASE_URL'); + $base =~ s{http://}{http://lichfielddc.} unless $test->{national}; + $mech->content_contains( $base . '/report/' . $report->id, 'confirm page links to correct site' ); if ( $test->{national} ) { |