1 files changed, 76 insertions, 14 deletions

diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index d973543ce..c8aca04aa 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -7,14 +7,18 @@ my $mech = FixMyStreet::TestMech->new;
 
 subtest "check that if no query we get sent back to the homepage" => sub {
     $mech->get_ok('/around');
-    is $mech->uri->path, '/around', "still at  '/around'";
+    is $mech->uri->path, '/', "redirected to '/'";
 };
 
 # x,y requests were generated by the old map code. We keep the behavior for
 # historic links
 subtest "redirect x,y requests to lat/lon (301 - permanent)" => sub {
 
-    $mech->get_ok('/around?x=3281&y=1113');
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->get_ok('/around?x=3281&y=1113');
+    };
 
     # did we redirect to lat,lon?
     is $mech->uri->path, '/around', "still on /around";
@@ -50,8 +54,12 @@ foreach my $test (
 {
     subtest "test bad pc value '$test->{pc}'" => sub {
         $mech->get_ok('/');
-        $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
-            "bad location" );
+        FixMyStreet::override_config {
+            GEOCODER => '',
+        }, sub {
+            $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
+                "bad location" );
+        };
         is_deeply $mech->page_errors, $test->{errors},
           "expected errors for pc '$test->{pc}'";
         is_deeply $mech->pc_alternatives, $test->{pc_alternatives},
@@ -63,8 +71,8 @@ foreach my $test (
 foreach my $test (
     {
         pc        => 'SW1A 1AA',
-        latitude  => '51.50101',
-        longitude => '-0.141587',
+        latitude  => '51.501009',
+        longitude => '-0.141588',
     },
     {
         pc        => 'TQ 388 773',
@@ -75,8 +83,13 @@ foreach my $test (
 {
     subtest "check lat/lng for '$test->{pc}'" => sub {
         $mech->get_ok('/');
-        $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
-            "good location" );
+        FixMyStreet::override_config {
+            ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+            MAPIT_URL => 'http://mapit.uk/',
+        }, sub {
+            $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
+                "good location" );
+        };
         is_deeply $mech->page_errors, [], "no errors for pc '$test->{pc}'";
         is_deeply $mech->extract_location, $test,
           "got expected location for pc '$test->{pc}'";
@@ -85,16 +98,21 @@ foreach my $test (
 
 subtest 'check non public reports are not displayed on around page' => sub {
     my $params = {
-        postcode  => 'EH99 1SP',
+        postcode  => 'EH1 1BB',
         latitude  => 55.9519637512,
         longitude => -3.17492254484,
     };
     my @edinburgh_problems =
-      $mech->create_problems_for_council( 5, 2651, 'Around page', $params );
+      $mech->create_problems_for_body( 5, 2651, 'Around page', $params );
 
     $mech->get_ok('/');
-    $mech->submit_form_ok( { with_fields => { pc => 'EH99 1SP' } },
-        "good location" );
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
+            "good location" );
+    };
     $mech->content_contains( 'Around page Test 3 for 2651',
         'problem to be marked non public visible' );
 
@@ -102,11 +120,55 @@ subtest 'check non public reports are not displayed on around page' => sub {
     ok $private->update( { non_public => 1 } ), 'problem marked non public';
 
     $mech->get_ok('/');
-    $mech->submit_form_ok( { with_fields => { pc => 'EH99 1SP' } },
-        "good location" );
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
+            "good location" );
+    };
     $mech->content_lacks( 'Around page Test 3 for 2651',
         'problem marked non public is not visible' );
 };
 
 
+subtest 'check category and status filtering works on /ajax' => sub {
+    my $categories = [ 'Pothole', 'Vegetation', 'Flytipping' ];
+    my $params = {
+        postcode  => 'OX1 1ND',
+        latitude  => 51.7435918829363,
+        longitude => -1.23201966270446,
+    };
+    my $bbox = ($params->{longitude} - 0.01) . ',' .  ($params->{latitude} - 0.01)
+                . ',' . ($params->{longitude} + 0.01) . ',' .  ($params->{latitude} + 0.01);
+
+    # Create one open and one fixed report in each category
+    foreach my $category ( @$categories ) {
+        foreach my $state ( 'confirmed', 'fixed' ) {
+            my %report_params = (
+                %$params,
+                category => $category,
+                state => $state,
+            );
+            $mech->create_problems_for_body( 1, 2237, 'Around page', \%report_params );
+        }
+    }
+
+    my $json = $mech->get_ok_json( '/ajax?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 );
+    $pins = $json->{pins};
+    is scalar @$pins, 2, 'correct number of Pothole reports';
+
+    $json = $mech->get_ok_json( '/ajax?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 );
+    $pins = $json->{pins};
+    is scalar @$pins, 1, 'correct number of fixed Vegetation reports';
+};
+
 done_testing();