diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-11-06 12:26:26 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-11-06 12:26:26 +0000 |
| commit | 53e22391a3975b2c2a9ebca8b75fab6127c767b7 (patch) | |
| tree | 8c667b07a9c07dbc0c11e2d3bb003b6da9dc6db2 /t/app/controller | |
| parent | 91bec61612a5ad0c4ee87942dae0611a9a211243 (diff) | |
| parent | 27f6a53b0be0e36ffccbabd45592ee6fddf0092a (diff) | |
Merge branch 'around-and-about-pagination'
Diffstat (limited to 't/app/controller')
| -rw-r--r-- | t/app/controller/around.t | 10 | ||||
| -rw-r--r-- | t/app/controller/report_new.t | 2 | ||||
| -rw-r--r-- | t/app/controller/report_new_text.t | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/t/app/controller/around.t b/t/app/controller/around.t index cdaeaf363..8b4fc7825 100644 --- a/t/app/controller/around.t +++ b/t/app/controller/around.t @@ -135,7 +135,7 @@ subtest 'check non public reports are not displayed on around page' => sub { }; -subtest 'check category and status filtering works on /ajax' => sub { +subtest 'check category and status filtering works on /around?ajax' => sub { my $categories = [ 'Pothole', 'Vegetation', 'Flytipping' ]; my $params = { postcode => 'OX1 1ND', @@ -157,19 +157,19 @@ subtest 'check category and status filtering works on /ajax' => sub { } } - my $json = $mech->get_ok_json( '/ajax?bbox=' . $bbox ); + my $json = $mech->get_ok_json( '/around?ajax=1&bbox=' . $bbox ); my $pins = $json->{pins}; is scalar @$pins, 6, 'correct number of reports when no filters'; - $json = $mech->get_ok_json( '/ajax?filter_category=Pothole&bbox=' . $bbox ); + $json = $mech->get_ok_json( '/around?ajax=1&filter_category=Pothole&bbox=' . $bbox ); $pins = $json->{pins}; is scalar @$pins, 2, 'correct number of Pothole reports'; - $json = $mech->get_ok_json( '/ajax?status=open&bbox=' . $bbox ); + $json = $mech->get_ok_json( '/around?ajax=1&status=open&bbox=' . $bbox ); $pins = $json->{pins}; is scalar @$pins, 3, 'correct number of open reports'; - $json = $mech->get_ok_json( '/ajax?status=fixed&filter_category=Vegetation&bbox=' . $bbox ); + $json = $mech->get_ok_json( '/around?ajax=1&status=fixed&filter_category=Vegetation&bbox=' . $bbox ); $pins = $json->{pins}; is scalar @$pins, 1, 'correct number of fixed Vegetation reports'; }; diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index efe392eab..f741ec796 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -893,7 +893,7 @@ foreach my $test ( # Test that AJAX pages return the right data $mech->get_ok( - '/ajax?bbox=' . ($report->longitude - 0.01) . ',' . ($report->latitude - 0.01) + '/around?ajax=1&bbox=' . ($report->longitude - 0.01) . ',' . ($report->latitude - 0.01) . ',' . ($report->longitude + 0.01) . ',' . ($report->latitude + 0.01) ); $mech->content_contains( "Test Report at caf\xc3\xa9" ); diff --git a/t/app/controller/report_new_text.t b/t/app/controller/report_new_text.t index 94f350eba..734b9dbb4 100644 --- a/t/app/controller/report_new_text.t +++ b/t/app/controller/report_new_text.t @@ -362,7 +362,7 @@ subtest "test report creation for a user who is logged in" => sub { $mech->logged_in_ok; $mech->get_ok( - '/ajax?bbox=' . ($report->longitude - 0.01) . ',' . ($report->latitude - 0.01) + '/around?ajax=1&bbox=' . ($report->longitude - 0.01) . ',' . ($report->latitude - 0.01) . ',' . ($report->longitude + 0.01) . ',' . ($report->latitude + 0.01) ); $mech->content_contains( "Test Report at caf\xc3\xa9" ); |