diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-23 14:38:07 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-23 14:38:07 +0100 |
| commit | 11c91b87abe2e89e8dc63a4d541fba7ed1d096b3 (patch) | |
| tree | 5a315646cda9691ca63fd52f4cb3f9d3aafb1b4b /t/app/controller | |
| parent | 41c7d068f954e062b4da0675b5782211b8ad10c3 (diff) | |
| parent | 09ce7aeb489e5a43054c3b2b7bfa47fd6aba7c43 (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
templates/web/default/report/display.html
Diffstat (limited to 't/app/controller')
| -rw-r--r-- | t/app/controller/admin.t | 2 | ||||
| -rw-r--r-- | t/app/controller/report_updates.t | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index b92041830..ba5095cea 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -133,7 +133,7 @@ subtest 'check summary counts' => sub { ok $mech->host('fixmystreet.com'); }; -my $host = FixMyStreet->config('OPTION_BASE_URL'); +my $host = FixMyStreet->config('BASE_URL'); $mech->get_ok('/admin/council_contacts/2650'); $mech->content_contains('Aberdeen City Council'); $mech->content_contains('AB15 8RN'); diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index bec81fb83..5d14a893f 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -276,7 +276,7 @@ for my $test ( initial_values => { name => '', rznvy => '', - may_show_name => undef, + may_show_name => 1, add_alert => 1, photo => '', update => '', @@ -295,7 +295,7 @@ for my $test ( initial_values => { name => '', rznvy => '', - may_show_name => undef, + may_show_name => 1, add_alert => 1, photo => '', update => '', |