diff options
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Around.pm | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 2 | ||||
| -rw-r--r-- | t/app/controller/develop.t | 3 | ||||
| -rw-r--r-- | t/app/controller/root.t | 1 | ||||
| -rw-r--r-- | t/cobrand/zurich.t | 1 | ||||
| -rw-r--r-- | t/open311/getservicerequestupdates.t | 5 | ||||
| -rw-r--r-- | t/photostorage/s3.t | 5 | ||||
| -rw-r--r-- | templates/web/base/pagination.html | 2 |
8 files changed, 14 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index db2eceda3..a1258ccaa 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -258,6 +258,7 @@ sub map_features : Private { my ($self, $c, $extra) = @_; $c->stash->{page} = 'around'; # Needed by _item.html / so the map knows to make clickable pins, update on pan + $c->stash->{num_old_reports} = 0; $c->forward( '/reports/stash_report_filter_status' ); $c->forward( '/reports/stash_report_sort', [ 'created-desc' ]); diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index dd4fef388..f057a31f6 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -258,7 +258,7 @@ sub by_category_ajax_data : Private { my ($self, $c, $type, $category) = @_; my $generate; - if (($c->stash->{category_extras}->{$category} && @{ $c->stash->{category_extras}->{$category} } >= 1) or \ + if (($c->stash->{category_extras}->{$category} && @{ $c->stash->{category_extras}->{$category} } >= 1) or $c->stash->{unresponsive}->{$category} or $c->stash->{report_extra_fields}) { $generate = 1; } diff --git a/t/app/controller/develop.t b/t/app/controller/develop.t index 8f26a9f16..7fde5ef83 100644 --- a/t/app/controller/develop.t +++ b/t/app/controller/develop.t @@ -1,5 +1,8 @@ use FixMyStreet::TestMech; +FixMyStreet::App->log->disable('info'); +END { FixMyStreet::App->log->enable('info'); } + ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' ); my ($problem) = $mech->create_problems_for_body(1, 2504, 'title'); diff --git a/t/app/controller/root.t b/t/app/controller/root.t index b5f8ba031..85119da24 100644 --- a/t/app/controller/root.t +++ b/t/app/controller/root.t @@ -75,7 +75,6 @@ FixMyStreet::override_config { }; subtest "check_login_disallowed cobrand hook" => sub { - warn '#' x 50 . "\n"; my $cobrand = Test::MockModule->new('FixMyStreet::Cobrand::Default'); $cobrand->mock('check_login_disallowed', sub { my $self = shift; diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t index dbd6ec882..2f60231ab 100644 --- a/t/cobrand/zurich.t +++ b/t/cobrand/zurich.t @@ -959,7 +959,6 @@ subtest "test stats" => sub { }; subtest "test admin_log" => sub { - diag $report->id; my @entries = FixMyStreet::DB->resultset('AdminLog')->search({ object_type => 'problem', object_id => $report->id, diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t index 995338063..2f7917946 100644 --- a/t/open311/getservicerequestupdates.t +++ b/t/open311/getservicerequestupdates.t @@ -421,7 +421,10 @@ for my $test ( $problem->state( $test->{start_state} ); $problem->update; - my $update = Open311::GetServiceRequestUpdates->new( system_user => $user ); + my $update = Open311::GetServiceRequestUpdates->new( + system_user => $user, + blank_updates_permitted => 1, + ); $update->update_comments( $o, $bodies{2482} ); is $problem->comments->count, 1, 'comment count'; diff --git a/t/photostorage/s3.t b/t/photostorage/s3.t index fa989374f..ec0fadc15 100644 --- a/t/photostorage/s3.t +++ b/t/photostorage/s3.t @@ -2,6 +2,7 @@ use FixMyStreet::Test; use Test::MockModule; +use Test::Warn; use Path::Tiny 'path'; use Net::Amazon::S3::Client::Bucket; @@ -112,7 +113,9 @@ FixMyStreet::override_config { $create_bucket_called = 1; }); - ok !$s3->init(), "PhotoStorage::S3::init failed"; + warning_like { + $s3->init(); + } qr/S3 bucket 'fms-test-photos' doesn't exist and CREATE_BUCKET is not set./, 'PhotoStorage::S3::init failed'; ok $buckets_called, "Client::buckets called"; ok !$create_bucket_called, "Client::create_bucket not called"; }; diff --git a/templates/web/base/pagination.html b/templates/web/base/pagination.html index 7ae3559ce..3b7bdc0b2 100644 --- a/templates/web/base/pagination.html +++ b/templates/web/base/pagination.html @@ -8,7 +8,7 @@ [% IF pager.next_page %] <a class="next" href="[% c.uri_with({ $param => pager.next_page, ajax => undefined }) %][% '#' _ hash IF hash %]">[% loc('Next') %]</a> - [% ELSIF num_old_reports > 0 AND NOT show_old_reports AND page == 'around' %] + [% ELSIF page == 'around' AND num_old_reports > 0 AND NOT show_old_reports %] <a class="next show_old" href="[% c.uri_with({ $param => pager.current_page, show_old_reports = 1, ajax => undefined }) %][% '#' _ hash IF hash %]">[% loc('Show older') %]</a> [% END %] </p> |