Corrected tests and docs. Still need to fix code.

2 files changed, 91 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Tokens.pm b/perllib/FixMyStreet/App/Controller/Tokens.pm
index 1d64d9e18..369be23c6 100644
--- a/perllib/FixMyStreet/App/Controller/Tokens.pm
+++ b/perllib/FixMyStreet/App/Controller/Tokens.pm
@@ -72,7 +72,9 @@ sub confirm_problem : Path('/P') {
 
     /P/...
 
-Redirect user to continue filling in a partial problem.
+Redirect user to continue filling in a partial problem. The request is sent to
+'/report/new' which might redirect again to '/around' if there is no location
+found.
 
 =cut
 
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index 764357b57..25f5dddf9 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -101,12 +101,13 @@ subtest "Submit a correct entry" => sub {
     # go to the token url
     $mech->get_ok($token_url);
 
+    # check that we are on '/around'
+    is $mech->uri->path, '/around', "sent to /around";
+
     # check that we are not shown anything as we don't have a location yet
     is_deeply $mech->visible_form_values, { pc => '' },
       "check only pc field is shown";
 
-    is $mech->uri->path, '/around', "sent to report page";
-
     $mech->submit_form_ok(    #
         { with_fields => { pc => 'SW1A 1AA' } },
         "fill in postcode"
@@ -159,4 +160,89 @@ subtest "Submit a correct entry" => sub {
     $mech->delete_user($user);
 };
 
+# submit an empty report to import - check we get all errors
+subtest "Submit a correct entry (with location)" => sub {
+
+    $mech->get_ok('/import');
+
+    $mech->submit_form_ok(    #
+        {
+            with_fields => {
+                service   => 'test-script',
+                latitude  => '51.5010096115539',           # SW1A 1AA
+                longitude => '-0.141587067110009',
+                latitude  => '',
+                longitude => '',
+                name      => 'Test User ll',
+                email     => 'test-ll@example.com',
+                subject   => 'Test report ll',
+                detail    => 'This is a test report ll',
+                photo     => $sample_file,
+            }
+        },
+        "fill in form"
+    );
+
+    is_deeply( $mech->import_errors, [], "got no errors" );
+    is $mech->content, 'SUCCESS', "Got success response";
+
+    # check that we have received the email
+    $mech->email_count_is(1);
+    my $email = $mech->get_email;
+    $mech->clear_emails_ok;
+
+    my ($token_url) = $email->body =~ m{(http://\S+)};
+    ok $token_url, "Found a token url $token_url";
+
+    # go to the token url
+    $mech->get_ok($token_url);
+
+    # check that we are on '/around'
+    is $mech->uri->path, '/report/new', "sent to /around";
+
+    # check that fields are prefilled for us
+    is_deeply $mech->visible_form_values,
+      {
+        name          => 'Test User ll',
+        email         => 'test-ll@example.com',
+        title         => 'Test report ll',
+        detail        => 'This is a test report ll',
+        photo         => '',
+        phone         => '',
+        may_show_name => '1',
+      },
+      "check imported fields are shown";
+
+  TODO: {
+        local $TODO = "'/report/123' urls not served by catalyst yet";
+
+        # change the details
+        $mech->submit_form_ok(    #
+            {
+                with_fields => {
+                    name          => 'New Test User',
+                    email         => 'test@example.com',
+                    title         => 'New Test report',
+                    detail        => 'This is a test report',
+                    phone         => '01234 567 890',
+                    may_show_name => '1',
+                }
+            },
+            "Update details and save"
+        );
+    }
+
+    # check that report has been created
+    my $user =
+      FixMyStreet::App->model('DB::User')
+      ->find( { email => 'test-ll@example.com' } );
+    ok $user, "Found a user";
+
+    my $report = $user->problems->first;
+    is $report->state, 'confirmed',          'is confirmed';
+    is $report->title, 'New Test report ll', 'title is correct';
+
+    $mech->delete_user($user);
+};
+
 done_testing();