1 files changed, 29 insertions, 2 deletions
diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t
index 75542d759..05aed7262 100644
--- a/t/app/controller/questionnaire.t
+++ b/t/app/controller/questionnaire.t
@@ -40,6 +40,26 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
 my $report_id = $report->id;
 ok $report, "created test report - $report_id";
 
+# Make sure questionnaires aren't sent if the report is closed.
+foreach my $state (
+    'closed', 'duplicate', 'not responsible', 'unable to fix', 'internal referral'
+) {
+    subtest "questionnaire not sent for $state state" => sub {
+        $report->update( { send_questionnaire => 1, state => $state } );
+        $report->questionnaires->delete;
+        FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires( {
+            site => 'fixmystreet'
+        } );
+
+        $mech->email_count_is(0);
+
+        $report->discard_changes;
+        is $report->send_questionnaire, 0;
+    }
+}
+$report->update( { send_questionnaire => 1, state => 'confirmed' } );
+$report->questionnaires->delete;
+
 # Call the questionaire sending function...
 FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires( {
     site => 'fixmystreet'
@@ -85,10 +105,16 @@ foreach my $test (
     },
     {
         desc => 'User goes to questionnaire URL for an already answered questionnaire',
-        answered => \'current_timestamp',
+        answered => \"current_timestamp - '10 minutes'::interval",
         content => 'already answered this questionnaire',
         code => 400,
     },
+    {
+        desc => 'User goes to questionnaire URL for a very recently answered questionnaire',
+        answered => \"current_timestamp - '10 seconds'::interval",
+        content_lacks => 'already answered this questionnaire',
+        code => 200,
+    },
 ) {
     subtest $test->{desc} => sub {
         $report->state( $test->{state} || 'confirmed' );
@@ -99,7 +125,8 @@ foreach my $test (
         $token .= $test->{token_extra} if $test->{token_extra};
         $mech->get("/Q/$token");
         is $mech->res->code, $test->{code}, "Right status received";
-        $mech->content_contains( $test->{content} );
+        $mech->content_contains( $test->{content} ) if $test->{content};
+        $mech->content_lacks( $test->{content_lacks} ) if $test->{content_lacks};
         # Reset, no matter what test did
         $report->state( 'confirmed' );
         $report->update;