Merge tag 'v2.6' into fiksgatami-dev

1 files changed, 40 insertions, 1 deletions

diff --git a/t/app/controller/open311.t b/t/app/controller/open311.t
index 9f4f594fe..79fe159a3 100644
--- a/t/app/controller/open311.t
+++ b/t/app/controller/open311.t
@@ -6,7 +6,7 @@ my $mech = FixMyStreet::TestMech->new;
 $mech->get_ok('/open311.cgi/v2/requests.rss?jurisdiction_id=fiksgatami.no&status=open&agency_responsible=1854');
 like $mech->uri, qr[/open311/v2/requests\.rss\?.{65}]; # Don't know order parameters will be in now
 
-$mech->create_problems_for_body(2, 2237, 'Around page');
+my ($problem1, $problem2) = $mech->create_problems_for_body(2, 2237, 'Around page');
 $mech->get_ok('/open311/v2/requests.xml?jurisdiction_id=foo&status=open&agency_responsible=2237');
 $mech->content_contains('<description>Around page Test 2 for 2237: Around page Test 2 for 2237 Detail</description>');
 $mech->content_contains('<interface_used>Web interface</interface_used>');
@@ -18,4 +18,43 @@ my $problems = $json->{requests}[0]{request};
 is @$problems, 2;
 like $problems->[0]{description}, qr/Around page Test/;
 
+subtest "non_public reports aren't available" => sub {
+    $problem1->update({
+        non_public => 1,
+        detail => 'This report is now private',
+    });
+    $mech->get_ok('/open311/v2/requests.json?jurisdiction_id=foo');
+    $json = decode_json($mech->content);
+    $problems = $json->{requests}[0]{request};
+    is @$problems, 1;
+    like $problems->[0]{description}, qr/Around page Test/;
+    $mech->content_lacks('This report is now private');
+
+    my $problem_id = $problem1->id;
+    $mech->get_ok("/open311/v2/requests/$problem_id.json?jurisdiction_id=foo");
+    $json = decode_json($mech->content);
+    $problems = $json->{requests}[0]{request};
+    is @$problems, 0;
+};
+
+subtest "hidden reports aren't available" => sub {
+    $problem1->update({
+        non_public => 0,
+        detail => 'This report is now hidden',
+        state => "hidden",
+    });
+    $mech->get_ok('/open311/v2/requests.json?jurisdiction_id=foo');
+    $json = decode_json($mech->content);
+    $problems = $json->{requests}[0]{request};
+    is @$problems, 1;
+    like $problems->[0]{description}, qr/Around page Test/;
+    $mech->content_lacks('This report is now hidden');
+
+    my $problem_id = $problem1->id;
+    $mech->get_ok("/open311/v2/requests/$problem_id.json?jurisdiction_id=foo");
+    $json = decode_json($mech->content);
+    $problems = $json->{requests}[0]{request};
+    is @$problems, 0;
+};
+
 done_testing();