Add ability to confirm reports/updates via text.

10 files changed, 747 insertions, 71 deletions

diff --git a/t/app/controller/auth_phone.t b/t/app/controller/auth_phone.t
index a2f8f9cac..8673f5c62 100644
--- a/t/app/controller/auth_phone.t
+++ b/t/app/controller/auth_phone.t
@@ -56,8 +56,7 @@ subtest 'Log in using mobile, by text' => sub {
         }, 'submit incorrect code');
         $mech->content_contains('Try again');
 
-        my $text = shift @{$twilio->texts};
-        my ($code) = $text->{Body} =~ /(\d+)/;
+        my $code = $twilio->get_text_code;
         $mech->submit_form_ok({
             with_fields => { code => $code }
         }, 'submit correct code');
diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t
index d16a0102e..031fb8d9e 100644
--- a/t/app/controller/auth_social.t
+++ b/t/app/controller/auth_social.t
@@ -102,13 +102,7 @@ for my $fb_state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                 $mech->content_contains('We need your email address, please give it below.');
                 # We don't have an email, so check that we can still submit it,
                 # and the ID carries through the confirmation
-                if ($page eq 'update') {
-                    $fields->{rznvy} = $fb_email;
-                } elsif ($page eq 'report') {
-                    $fields->{email} = $fb_email;
-                } else {
-                    $fields->{username} = $fb_email;
-                }
+                $fields->{username} = $fb_email;
                 $fields->{name} = 'Ffion Tester';
                 $mech->submit_form(with_fields => $fields);
                 $mech->content_contains('Nearly done! Now check your email');
@@ -216,13 +210,7 @@ for my $tw_state ( 'refused', 'existing UID', 'no email' ) {
                 $mech->content_contains('We need your email address, please give it below.');
                 # We don't have an email, so check that we can still submit it,
                 # and the ID carries through the confirmation
-                if ($page eq 'update') {
-                    $fields->{rznvy} = $tw_email;
-                } elsif ($page eq 'report') {
-                    $fields->{email} = $tw_email;
-                } else {
-                    $fields->{username} = $tw_email;
-                }
+                $fields->{username} = $tw_email;
                 $fields->{name} = 'Ffion Tester';
                 $mech->submit_form(with_fields => $fields);
                 $mech->content_contains('Nearly done! Now check your email');
diff --git a/t/app/controller/report_as_other.t b/t/app/controller/report_as_other.t
index daa213e8c..91644e8ce 100644
--- a/t/app/controller/report_as_other.t
+++ b/t/app/controller/report_as_other.t
@@ -47,7 +47,7 @@ subtest "Body user, has permission to add report as another user" => sub {
         detail => 'Test report details.',
         category => 'Potholes',
         name => 'Another User',
-        email => 'another@example.net',
+        username => 'another@example.net',
     );
     is $report->name, 'Another User', 'report name is given name';
     is $report->user->name, 'Another User', 'user name matches';
@@ -66,7 +66,7 @@ subtest "Body user, has permission to add report as another (existing) user" =>
         detail => 'Test report details.',
         category => 'Potholes',
         name => 'Existing Yooser',
-        email => 'existing@example.net',
+        username => 'existing@example.net',
     );
     is $report->name, 'Existing Yooser', 'report name is given name';
     is $report->user->name, 'Existing User', 'user name remains same';
@@ -108,7 +108,7 @@ subtest "Body user, has permission to add update as another user" => sub {
         form_as => 'another_user',
         update => 'Test Update',
         name => 'Another User',
-        rznvy => 'another2@example.net',
+        username => 'another2@example.net',
     );
     is $update->name, 'Another User', 'update name is given name';
     is $update->user->name, 'Another User', 'user name matches';
@@ -124,7 +124,7 @@ subtest "Body user, has permission to add update as another (existing) user" =>
         form_as => 'another_user',
         update => 'Test Update',
         name => 'Existing Yooser',
-        rznvy => 'existing@example.net',
+        username => 'existing@example.net',
     );
     is $update->name, 'Existing Yooser', 'update name is given name';
     is $update->user->name, 'Existing User', 'user name remains same';
diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t
index 4d73a5204..f0913fbd2 100644
--- a/t/app/controller/report_display.t
+++ b/t/app/controller/report_display.t
@@ -128,7 +128,7 @@ subtest "test a good report" => sub {
 
     my %fields = (
         name      => '',
-        rznvy     => '',
+        username => '',
         update    => '',
         add_alert => 1, # defaults to true
         fixed     => undef
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index 47113198e..e4a202db7 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -362,14 +362,12 @@ subtest "Submit a correct entry (with location) to cobrand" => sub {
         photo2         => '',
         photo3         => '',
         phone         => '',
-        email => 'test-ll@example.com',
+        username => 'test-ll@example.com',
       },
       "check imported fields are shown"
           or diag Dumper( $mech->visible_form_values ); use Data::Dumper;
 
-    my $user =
-      FixMyStreet::App->model('DB::User')
-      ->find( { email => 'test-ll@example.com' } );
+    my $user = FixMyStreet::App->model('DB::User')->find( { email => 'test-ll@example.com' } );
     ok $user, "Found a user";
 
     my $report = $user->problems->first;
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index ab6b5d78e..efe392eab 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -101,6 +101,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => '1',
+            username      => '',
             email         => '',
             phone         => '',
             password_sign_in => '',
@@ -127,6 +128,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => '1',
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Something bad',
@@ -156,6 +158,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => '1',
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Street lighting',
@@ -182,6 +185,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => undef,
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Street lighting',
@@ -208,6 +212,7 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => undef,
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Street lighting',
@@ -233,6 +238,7 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Street lighting',
@@ -258,6 +264,7 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Street lighting',
@@ -283,6 +290,7 @@ foreach my $test (
             photo3        => '',
             name          => 'DUDE',
             may_show_name => '1',
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Street lighting',
@@ -307,6 +315,7 @@ foreach my $test (
             photo3        => '',
             name          => 'anonymous',
             may_show_name => '1',
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Street lighting',
@@ -331,14 +340,15 @@ foreach my $test (
             photo3        => '',
             name          => 'Joe Smith',
             may_show_name => '1',
-            email         => 'not an email',
+            username      => 'not an email',
+            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
             remember_me => undef,
         },
-        changes => { email => 'notanemail', },
+        changes => { username => 'notanemail', email => 'notanemail' },
         errors  => [ 'Please enter a valid email', ],
     },
     {
@@ -352,6 +362,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => '1',
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Street lighting',
@@ -379,7 +390,8 @@ foreach my $test (
             photo3        => '',
             name          => '  Bob    Jones   ',
             may_show_name => '1',
-            email         => '   BOB @ExAmplE.COM   ',
+            username      => '   BOB @ExAmplE.COM   ',
+            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
@@ -388,6 +400,7 @@ foreach my $test (
         },
         changes => {
             name  => 'Bob Jones',
+            username => 'bob@example.com',
             email => 'bob@example.com',
         },
         errors => [ 'Please enter a subject', 'Please enter some details', ],
@@ -403,6 +416,7 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
+            username      => 'bob@example.com',
             email         => 'bob@example.com',
             phone         => '',
             category      => 'Street lighting',
@@ -426,6 +440,7 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
+            username      => 'bob@example.com',
             email         => 'bob@example.com',
             phone         => '',
             category      => 'Street lighting',
@@ -449,6 +464,7 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
+            username      => 'bob@example.com',
             email         => 'bob@example.com',
             phone         => '',
             category      => 'Street lighting',
@@ -560,7 +576,7 @@ foreach my $test (
                     photo1        => '',
                     name          => 'Joe Bloggs',
                     may_show_name => '1',
-                    email         => 'test-1@example.com',
+                    username      => 'test-1@example.com',
                     phone         => '07903 123 456',
                     category      => 'Street lighting',
                     password_register => $test->{password} ? 'secret' : '',
@@ -674,7 +690,7 @@ subtest "test password errors for a user who is signing in as they report" => su
                     title         => 'Test Report',
                     detail        => 'Test report details.',
                     photo1        => '',
-                    email         => 'test-2@example.com',
+                    username      => 'test-2@example.com',
                     password_sign_in => 'secret1',
                     category      => 'Street lighting',
                 }
@@ -685,7 +701,7 @@ subtest "test password errors for a user who is signing in as they report" => su
 
     # check that we got the errors expected
     is_deeply $mech->page_errors, [
-        "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the \x{2018}sign in by email\x{2019} section of the form.",
+        "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the \x{2018}No\x{2019} section of the form.",
     ], "check there were errors";
 };
 
@@ -726,7 +742,7 @@ subtest "test report creation for a user who is signing in as they report" => su
                     title         => 'Test Report',
                     detail        => 'Test report details.',
                     photo1        => '',
-                    email         => 'test-2@example.com',
+                    username      => 'test-2@example.com',
                     password_sign_in => 'secret2',
                     category      => 'Street lighting',
                 }
@@ -947,7 +963,7 @@ subtest "test report creation for a category that is non public" => sub {
                     title         => 'Test Report',
                     detail        => 'Test report details.',
                     photo1        => '',
-                    email         => 'test-2@example.com',
+                    username      => 'test-2@example.com',
                     name          => 'Joe Bloggs',
                     category      => 'Street lighting',
                 }
@@ -1135,7 +1151,7 @@ for my $test (
             title             => "Test Report",
             detail            => 'Test report details.',
             photo1            => '',
-            email             => 'firstlast@example.com',
+            username          => 'firstlast@example.com',
             may_show_name     => '1',
             phone             => '07903 123 456',
             category          => 'Trees',
@@ -1167,9 +1183,7 @@ for my $test (
         # confirm token in order to update the user details
         $mech->get_ok($url);
 
-        my $user =
-          FixMyStreet::App->model('DB::User')
-          ->find( { email => 'firstlast@example.com' } );
+        my $user = FixMyStreet::App->model('DB::User')->find( { email => 'firstlast@example.com' } );
 
         my $report = $user->problems->first;
         ok $report, "Found the report";
@@ -1284,7 +1298,7 @@ subtest "test Hart" => sub {
                 $mech->submit_form_ok( { with_fields => { pc => 'GU51 4AE' } }, "submit location" );
                 $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
                 my %optional_fields = $test->{confirm} ?  () :
-                    ( email => $test_email, phone => '07903 123 456' );
+                    ( username => $test_email, phone => '07903 123 456' );
 
                 # we do this as otherwise test::www::mechanize::catalyst
                 # goes to the value set in ->host above irregardless and
@@ -1424,7 +1438,7 @@ subtest "unresponsive body handling works" => sub {
                     detail        => 'Test report details.',
                     photo1        => '',
                     name          => 'Joe Bloggs',
-                    email         => $test_email,
+                    username      => $test_email,
                     may_show_name => '1',
                     phone         => '07903 123 456',
                     category      => 'Trees',
@@ -1497,7 +1511,7 @@ subtest "unresponsive body handling works" => sub {
                     detail        => 'Test report details.',
                     photo1        => '',
                     name          => 'Joe Bloggs',
-                    email         => $test_email,
+                    username      => $test_email,
                     may_show_name => '1',
                     phone         => '07903 123 456',
                     category      => 'Trees',
@@ -1618,7 +1632,7 @@ subtest "extra google analytics code displayed on email confirmation problem cre
             title             => "Test Report",
             detail            => 'Test report details.',
             photo1            => '',
-            email             => 'firstlast@example.com',
+            username          => 'firstlast@example.com',
             name              => 'Test User',
             may_show_name     => '1',
             phone             => '07903 123 456',
@@ -1639,9 +1653,7 @@ subtest "extra google analytics code displayed on email confirmation problem cre
         $mech->get_ok($url);
 
         # find the report
-        my $user =
-          FixMyStreet::App->model('DB::User')
-          ->find( { email => 'firstlast@example.com' } );
+        my $user = FixMyStreet::App->model('DB::User')->find( { email => 'firstlast@example.com' } );
 
         my $report = $user->problems->first;
         ok $report, "Found the report";
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index 9a4a81182..0224e7e47 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -54,6 +54,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => '1',
+            username      => '',
             email         => '',
             phone         => '',
             category      => 'Street lighting',
@@ -76,7 +77,7 @@ foreach my $test (
             title => 'test',
             detail => 'test detail',
             name => 'Test User',
-            email => 'testopen311@example.com',
+            username => 'testopen311@example.com',
             category => 'Street lighting',
             number => 27,
         },
@@ -100,7 +101,7 @@ foreach my $test (
         $mech->clear_emails_ok;
 
         # check that the user does not exist
-        my $test_email = $test->{submit_with}->{email};
+        my $test_email = $test->{submit_with}->{username};
         my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
         if ( $user ) {
             $user->problems->delete;
diff --git a/t/app/controller/report_new_text.t b/t/app/controller/report_new_text.t
new file mode 100644
index 000000000..94f350eba
--- /dev/null
+++ b/t/app/controller/report_new_text.t
@@ -0,0 +1,371 @@
+use FixMyStreet::TestMech;
+use t::Mock::Twilio;
+
+my $twilio = t::Mock::Twilio->new;
+LWP::Protocol::PSGI->register($twilio->to_psgi_app, host => 'api.twilio.com');
+
+# disable info logs for this test run
+FixMyStreet::App->log->disable('info');
+END { FixMyStreet::App->log->enable('info'); }
+
+my $mech = FixMyStreet::TestMech->new;
+
+my $body = $mech->create_body_ok(2651, 'City of Edinburgh Council');
+$mech->create_contact_ok( body_id => $body->id, category => 'Street lighting', email => 'highways@example.com' );
+$mech->create_contact_ok( body_id => $body->id, category => 'Trees', email => 'trees@example.com' );
+
+# test that phone number validation works okay
+foreach my $test (
+    {
+        msg => 'invalid number',
+        pc => 'EH1 1BB',
+        fields => {
+            username => '0121 4960000000', email => '', phone => '',
+            title => 'Title', detail => 'Detail', name => 'Bob Jones',
+            category => 'Street lighting',
+            may_show_name => '1', remember_me => undef,
+            photo1 => '', photo2 => '', photo3 => '',
+            password_register => '', password_sign_in => '',
+        },
+        changes => {
+            username => '01214960000000',
+            phone => '01214960000000',
+        },
+        errors => [ 'Please check your phone number is correct' ],
+    },
+    {
+        msg => 'landline number',
+        pc => 'EH1 1BB',
+        fields => {
+            username => '0121 4960000', email => '', phone => '',
+            title => 'Title', detail => 'Detail', name => 'Bob Jones',
+            category => 'Street lighting',
+            may_show_name => '1', remember_me => undef,
+            photo1 => '', photo2 => '', photo3 => '',
+            password_register => '', password_sign_in => '',
+        },
+        changes => {
+            username => '+44 121 496 0000',
+            phone => '+44 121 496 0000',
+        },
+        errors => [ 'Please enter a mobile number', ],
+    },
+  )
+{
+    subtest "check form errors where $test->{msg}" => sub {
+        $mech->get_ok('/around');
+
+        FixMyStreet::override_config {
+            ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+            MAPIT_URL => 'http://mapit.uk/',
+            SMS_AUTHENTICATION => 1,
+            PHONE_COUNTRY => 'GB',
+        }, sub {
+            $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
+                "submit location" );
+            is_deeply $mech->page_errors, [], "no errors for pc '$test->{pc}'";
+
+            # click through to the report page
+            $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
+                "follow 'skip this step' link" );
+
+            # submit the main form
+            $mech->submit_form_ok( { with_fields => $test->{fields} }, "submit form" );
+        };
+
+        # check that we got the errors expected
+        is_deeply [ sort @{$mech->page_errors} ], [ sort @{$test->{errors}} ], "check errors";
+
+        # check that fields have changed as expected
+        my $new_values = {
+            %{ $test->{fields} },     # values added to form
+            %{ $test->{changes} },    # changes we expect
+        };
+        is_deeply $mech->visible_form_values, $new_values,
+          "values correctly changed";
+    };
+}
+
+my $test_phone = '+61491570156';
+my $first_user;
+foreach my $test (
+    {
+        desc => 'does not have an account, does not set a password',
+        user => 0, password => 0,
+    },
+    {
+        desc => 'does not have an account, sets a password',
+        user => 0, password => 1,
+    },
+    {
+        desc => 'does have an account and is not signed in; does not sign in, does not set a password',
+        user => 1, password => 0,
+    },
+    {
+        desc => 'does have an account and is not signed in; does not sign in, sets a password',
+        user => 1, password => 1,
+    },
+) {
+  subtest "test report creation for a user who " . $test->{desc} => sub {
+    $mech->log_out_ok;
+
+    if ($test->{user}) {
+        my $user = FixMyStreet::App->model('DB::User')->find( { phone => $test_phone } );
+        ok $user, "test user does exist";
+        $user->problems->delete;
+        $user->name( 'Old Name' );
+        $user->password( 'old_password' );
+        $user->update;
+    } elsif (!$first_user) {
+        ok !FixMyStreet::App->model('DB::User')->find( { phone => $test_phone } ),
+          "test user does not exist";
+        $first_user = 1;
+    } else {
+        # Not first pass, so will exist, but want no user to start, so delete it.
+        $mech->delete_user($test_phone);
+    }
+
+    $mech->get_ok('/around');
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+        SMS_AUTHENTICATION => 1,
+        PHONE_COUNTRY => 'GB',
+        TWILIO_ACCOUNT_SID => 'AC123',
+    }, sub {
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } }, "submit location" );
+        $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
+        $mech->submit_form_ok(
+            {
+                button => 'submit_register',
+                with_fields => {
+                    title => 'Test Report', detail => 'Test report details.',
+                    photo1 => '',
+                    name => 'Joe Bloggs', may_show_name => '1',
+                    username => $test_phone,
+                    category => 'Street lighting',
+                    password_register => $test->{password} ? 'secret' : '',
+                }
+            },
+            "submit good details"
+        );
+    };
+
+    is_deeply $mech->page_errors, [], "check there were no errors";
+
+    my $user = FixMyStreet::App->model('DB::User')->find( { phone => $test_phone } );
+    ok $user, "user found";
+    if ($test->{user}) {
+        is $user->name, 'Old Name', 'name unchanged';
+        ok $user->check_password('old_password'), 'password unchanged';
+    } else {
+        is $user->name, undef, 'name not yet set';
+        is $user->password, '', 'password not yet set for new user';
+    }
+
+    my $report = $user->problems->first;
+    ok $report, "Found the report";
+    is $report->state, 'unconfirmed', "report not confirmed";
+    is $report->bodies_str, $body->id;
+
+    $mech->submit_form_ok({ with_fields => { code => '00000' } });
+    $mech->content_contains('Try again');
+
+    my $code = $twilio->get_text_code;
+    $mech->submit_form_ok({ with_fields => { code => $code } });
+
+    $report->discard_changes;
+    is $report->state, 'confirmed', "Report is now confirmed";
+
+    $mech->get_ok( '/report/' . $report->id );
+
+    is $report->name, 'Joe Bloggs', 'name updated correctly';
+    if ($test->{password}) {
+        ok $report->user->check_password('secret'), 'password updated correctly';
+    } elsif ($test->{user}) {
+        ok $report->user->check_password('old_password'), 'password unchanged, as no new one given';
+    } else {
+        is $report->user->password, '', 'password still not set, as none given';
+    }
+
+    # check that the reporter has an alert
+    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+        user => $report->user,
+        alert_type => 'new_updates',
+        parameter => $report->id,
+    } );
+    ok $alert, "created new alert";
+
+    # user is created and logged in
+    $mech->logged_in_ok;
+
+    # cleanup
+    $mech->delete_user($user)
+        if $test->{user} && $test->{password};
+  };
+}
+
+# this test to make sure that we don't see spurious error messages about
+# the name being blank when there is a sign in error
+subtest "test password errors for a user who is signing in as they report" => sub {
+    $mech->log_out_ok;
+
+    my $user = $mech->create_user_ok($test_phone);
+    ok $user->update( {
+        name => 'Joe Bloggs',
+        email => 'joe@example.net',
+        password => 'secret2',
+    } ), "set user details";
+
+    $mech->get_ok('/around');
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+        SMS_AUTHENTICATION => 1,
+    }, sub {
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } }, "submit location" );
+        $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
+        $mech->submit_form_ok(
+            {
+                button => 'submit_sign_in',
+                with_fields => {
+                    title => 'Test Report',
+                    detail => 'Test report details.',
+                    photo1 => '',
+                    username => $test_phone,
+                    password_sign_in => 'secret1',
+                    category => 'Street lighting',
+                }
+            },
+            "submit with wrong password"
+        );
+    };
+
+    # check that we got the errors expected
+    is_deeply $mech->page_errors, [
+        "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the \x{2018}No\x{2019} section of the form.",
+    ], "check there were errors";
+};
+
+subtest "test report creation for a user who is signing in as they report" => sub {
+    $mech->log_out_ok;
+    $mech->cookie_jar({});
+
+    my $user = $mech->create_user_ok($test_phone);
+
+    $mech->get_ok('/around');
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+        SMS_AUTHENTICATION => 1,
+    }, sub {
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } }, "submit location" );
+        $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
+        $mech->submit_form_ok(
+            {
+                button => 'submit_sign_in',
+                with_fields => {
+                    title => 'Test Report',
+                    detail => 'Test report details.',
+                    photo1 => '',
+                    username => $test_phone,
+                    password_sign_in => 'secret2',
+                    category => 'Street lighting',
+                }
+            },
+            "submit good details"
+        );
+
+        # check that we got the message expected
+        $mech->content_contains( 'You have successfully signed in; please check and confirm your details are accurate:' );
+
+        # Now submit with a name
+        $mech->submit_form_ok(
+            {
+                with_fields => {
+                    name => 'Joe Bloggs',
+                }
+            },
+            "submit good details"
+        );
+    };
+
+    my $report = $user->problems->first;
+    ok $report, "Found the report";
+    $mech->content_contains('Thank you for reporting this issue');
+    is $report->bodies_str, $body->id;
+    is $report->state, 'confirmed', "report is now confirmed";
+    $mech->get_ok( '/report/' . $report->id );
+    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+        user => $report->user,
+        alert_type => 'new_updates',
+        parameter => $report->id,
+    } );
+    ok $alert, "created new alert";
+
+    $mech->logged_in_ok;
+};
+
+subtest "test report creation for a user who is logged in" => sub {
+    my $user = $mech->create_user_ok($test_phone);
+    $mech->get_ok('/around');
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } }, "submit location" );
+        $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
+        is_deeply(
+            $mech->visible_form_values,
+            {
+                title => '',
+                detail => '',
+                may_show_name => '1',
+                name => 'Joe Bloggs',
+                email => 'joe@example.net',
+                photo1 => '',
+                photo2 => '',
+                photo3 => '',
+                category => '-- Pick a category --',
+            },
+            "user's details prefilled"
+        );
+
+        $mech->submit_form_ok(
+            {
+                with_fields => {
+                    title => "Test Report at café",
+                    detail => 'Test report details.',
+                    photo1 => '',
+                    name => 'Joe Bloggs',
+                    may_show_name => '1',
+                    category => 'Street lighting',
+                }
+            },
+            "submit good details"
+        );
+    };
+
+    my $report = $user->problems->first;
+    ok $report, "Found the report";
+    is $report->bodies_str, $body->id;
+    $mech->content_contains('Thank you for reporting this issue');
+    is $report->state, 'confirmed', "report is now confirmed";
+    $mech->get_ok( '/report/' . $report->id );
+    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+        user => $report->user,
+        alert_type => 'new_updates',
+        parameter => $report->id,
+    } );
+    ok $alert, "created new alert";
+
+    $mech->logged_in_ok;
+
+    $mech->get_ok(
+        '/ajax?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" );
+};
+
+done_testing();
diff --git a/t/app/controller/report_update_text.t b/t/app/controller/report_update_text.t
new file mode 100644
index 000000000..45b4e78c2
--- /dev/null
+++ b/t/app/controller/report_update_text.t
@@ -0,0 +1,307 @@
+use FixMyStreet::TestMech;
+use t::Mock::Twilio;
+
+my $twilio = t::Mock::Twilio->new;
+LWP::Protocol::PSGI->register($twilio->to_psgi_app, host => 'api.twilio.com');
+
+my $mech = FixMyStreet::TestMech->new;
+my $user = $mech->create_user_ok('test@example.com', name => 'Test User');
+my $user2 = $mech->create_user_ok('commenter@example.com', name => 'Commenter');
+my $body = $mech->create_body_ok(2504, 'Westminster City Council');
+
+my $dt = DateTime->new(
+    year => 2011,
+    month => 04,
+    day => 16,
+    hour => 15,
+    minute => 47,
+    second => 23
+);
+
+my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
+    {
+        postcode => 'SW1A 1AA',
+        bodies_str => $body->id,
+        areas => ',105255,11806,11828,2247,2504,',
+        category => 'Other',
+        title => 'Test 2',
+        detail => 'Test 2 Detail',
+        used_map => 't',
+        name => 'Test User',
+        anonymous => 'f',
+        state => 'confirmed',
+        confirmed => $dt->ymd . ' ' . $dt->hms,
+        lang => 'en-gb',
+        service => '',
+        cobrand => 'default',
+        cobrand_data => '',
+        send_questionnaire => 't',
+        latitude => '51.5016605453401',
+        longitude => '-0.142497580865087',
+        user_id => $user->id,
+    }
+);
+my $report_id = $report->id;
+ok $report, "created test report - $report_id";
+
+my $comment = FixMyStreet::App->model('DB::Comment')->find_or_create( {
+    problem_id => $report_id,
+    user_id => $user2->id,
+    name => 'Other User',
+    mark_fixed => 'false',
+    text => 'This is some update text',
+    state => 'confirmed',
+    confirmed => $dt->ymd . ' ' . $dt->hms,
+    anonymous => 'f',
+});
+
+my $comment_id = $comment->id;
+ok $comment, "created test update - $comment_id";
+
+for my $test (
+    {
+        desc => 'Invalid phone',
+        fields => {
+            username => '01214960000000',
+            update => 'Update',
+            name => 'Name',
+            photo1 => '',
+            photo2 => '',
+            photo3 => '',
+            fixed => undef,
+            add_alert => 1,
+            may_show_name => undef,
+            remember_me => undef,
+            password_sign_in => '',
+            password_register => '',
+        },
+        changes => {},
+        field_errors => [ 'Please check your phone number is correct' ]
+    },
+    {
+        desc => 'landline number',
+        fields => {
+            username => '01214960000',
+            update => 'Update',
+            name => 'Name',
+            photo1 => '',
+            photo2 => '',
+            photo3 => '',
+            fixed => undef,
+            add_alert => 1,
+            may_show_name => undef,
+            remember_me => undef,
+            password_register => '',
+            password_sign_in => '',
+        },
+        changes => {
+            username => '+44 121 496 0000',
+        },
+        field_errors => [ 'Please enter a mobile number' ]
+    },
+  )
+{
+    subtest "submit an update - $test->{desc}" => sub {
+        $mech->get_ok("/report/$report_id");
+
+        FixMyStreet::override_config {
+            SMS_AUTHENTICATION => 1,
+            PHONE_COUNTRY => 'GB',
+        }, sub {
+            $mech->submit_form_ok( { with_fields => $test->{fields} }, 'submit update' );
+        };
+
+        is_deeply $mech->page_errors, $test->{field_errors}, 'field errors';
+
+        my $values = {
+            %{ $test->{fields} },
+            %{ $test->{changes} },
+        };
+
+        is_deeply $mech->visible_form_values('updateForm'), $values, 'form changes';
+    };
+}
+
+my $test_phone = '+61491570156';
+for my $test (
+    {
+        desc => 'submit an update, unregistered, logged out',
+        form_values => {
+            submit_update => 1,
+            username => $test_phone,
+            update => 'Update from an unregistered user',
+            add_alert => undef,
+            name => 'Unreg User',
+            may_show_name => undef,
+        },
+    },
+    {
+        desc => 'submit an update, unregistered, logged out, sign up for alerts',
+        form_values => {
+            submit_update => 1,
+            username => $test_phone,
+            update => 'Update from an unregistered user',
+            add_alert => 1,
+            name => 'Unreg User',
+            may_show_name => undef,
+        },
+    },
+    {
+        desc => 'submit an update, registered, logged out, confirming by text',
+        registered => 1,
+        form_values => {
+            submit_update => 1,
+            username => $test_phone,
+            update => 'Update from a registered user',
+            add_alert => undef,
+            name => 'Reg User',
+            password_register => 'new_secret',
+        },
+    },
+) {
+    subtest $test->{desc} => sub {
+        $mech->log_out_ok();
+        my $user;
+        if ($test->{registered}) {
+            $user = $mech->create_user_ok( $test_phone );
+            $user->update( { name => 'Mr Reg', password => 'secret2' } );
+        }
+
+        $mech->get_ok("/report/$report_id");
+        FixMyStreet::override_config {
+            SMS_AUTHENTICATION => 1,
+            TWILIO_ACCOUNT_SID => 'AC123',
+        }, sub {
+            $mech->submit_form_ok( { with_fields => $test->{form_values} }, 'submit update');
+        };
+        $mech->content_contains('Nearly done! Now check your phone');
+
+        if ($user) {
+            $user->discard_changes;
+            ok $user->check_password( 'secret2' ), 'password unchanged';
+            is $user->name, 'Mr Reg', 'name unchanged';
+        }
+
+        my ($token) = $mech->content =~ /name="token" value="([^"]*)"/;
+        $token = FixMyStreet::App->model('DB::Token')->find({
+            token => $token,
+            scope => 'comment'
+        });
+        ok $token, 'Token found in database';
+
+        my $update_id = $token->data->{id};
+        my $add_alerts = $token->data->{add_alert};
+        my $update = FixMyStreet::App->model('DB::Comment')->find( { id => $update_id } );
+
+        ok $update, 'found update in database';
+        is $update->state, 'unconfirmed', 'update unconfirmed';
+        my $details = $test->{form_values};
+        is $update->user->phone, $details->{username}, 'update phone';
+        is $update->user->phone_verified, 1;
+        is $update->text, $details->{update}, 'update text';
+        is $add_alerts, $details->{add_alert} ? 1 : 0, 'do not sign up for alerts';
+
+        my $code = $twilio->get_text_code;
+        $mech->submit_form_ok( { with_fields => { code => '00000' } });
+        $mech->content_contains('Try again');
+        $mech->submit_form_ok( { with_fields => { code => $code } });
+
+        $mech->content_contains("/report/$report_id#update_$update_id");
+
+        if ($user) {
+            $user->discard_changes;
+            ok $user->check_password( 'new_secret' ), 'password changed';
+            is $user->name, 'Reg User', 'name changed';
+        } else {
+            $user = FixMyStreet::App->model( 'DB::User' )->find( { phone => $details->{username} } );
+            ok $user, 'found user';
+        }
+
+        my $alert = FixMyStreet::App->model( 'DB::Alert' )->find(
+            { user => $user, alert_type => 'new_updates', confirmed => 1, }
+        );
+
+        ok $details->{add_alert} ? defined( $alert ) : !defined( $alert ), 'sign up for alerts';
+
+        $update->discard_changes;
+        is $update->state, 'confirmed', 'update confirmed';
+        $mech->delete_user( $user );
+    };
+}
+
+for my $test (
+    {
+        desc => 'submit an update for a registered user, signing in with wrong password',
+        form_values => {
+            submit_update => 1,
+            username => $test_phone,
+            update => 'Update from a user',
+            add_alert => undef,
+            password_sign_in => 'secret',
+        },
+        field_errors => [
+            "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the \x{2018}No\x{2019} section of the form.",
+            'Please enter your name', # FIXME Not really necessary error
+        ],
+    },
+    {
+        desc => 'submit an update for a registered user and sign in',
+        form_values => {
+            submit_update => 1,
+            username => $test_phone,
+            update => 'Update from a user',
+            add_alert => undef,
+            password_sign_in => 'secret2',
+        },
+        message => 'You have successfully signed in; please check and confirm your details are accurate:',
+    }
+) {
+    subtest $test->{desc} => sub {
+        # Set things up
+        my $user = $mech->create_user_ok( $test->{form_values}->{username} );
+        my $pw = 'secret2';
+        $user->update( { name => 'Mr Reg', password => $pw } );
+        $report->comments->delete;
+
+        $mech->log_out_ok();
+        $mech->clear_emails_ok();
+        $mech->get_ok("/report/$report_id");
+        FixMyStreet::override_config {
+            SMS_AUTHENTICATION => 1,
+        }, sub {
+            $mech->submit_form_ok(
+                {
+                    button => 'submit_sign_in',
+                    with_fields => $test->{form_values}
+                },
+                'submit update'
+            );
+        };
+
+        $mech->content_contains($test->{message}) if $test->{message};
+
+        is_deeply $mech->page_errors, $test->{field_errors}, 'check there were errors'
+            if $test->{field_errors};
+
+        SKIP: {
+            skip( "Incorrect password", 4 ) unless $test->{form_values}{password_sign_in} eq $pw;
+
+            # Now submit with a name
+            $mech->submit_form_ok(
+                { with_fields => { name => 'Joe Bloggs', } },
+                "submit good details"
+            );
+
+            $mech->content_contains('Thank you for updating this issue');
+
+            my $update = $report->comments->first;
+            ok $update, 'found update';
+            is $update->text, $test->{form_values}->{update}, 'update text';
+            is $update->user->phone, $test->{form_values}->{username}, 'update user';
+            is $update->state, 'confirmed', 'update confirmed';
+            $mech->delete_user( $update->user );
+        }
+    };
+}
+
+done_testing();
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 0526b2fd7..7cb547081 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -196,7 +196,7 @@ for my $test (
     {
         desc => 'No email, no message',
         fields => {
-            rznvy  => '',
+            username  => '',
             update => '',
             name   => '',
             photo1 => '',
@@ -215,7 +215,7 @@ for my $test (
     {
         desc => 'Invalid email, no message',
         fields => {
-            rznvy  => 'test',
+            username  => 'test',
             update => '',
             name   => '',
             photo1 => '',
@@ -234,7 +234,7 @@ for my $test (
     {
         desc => 'email with spaces, no message',
         fields => {
-            rznvy  => 'test @ example. com',
+            username => 'test @ example. com',
             update => '',
             name   => '',
             photo1 => '',
@@ -248,14 +248,14 @@ for my $test (
             password_sign_in => '',
         },
         changes => {
-            rznvy => 'test@example.com',
+            username => 'test@example.com',
         },
         field_errors => [ 'Please enter a message', 'Please enter your name' ]
     },
     {
         desc => 'email with uppercase, no message',
         fields => {
-            rznvy  => 'test@EXAMPLE.COM',
+            username => 'test@EXAMPLE.COM',
             update => '',
             name   => '',
             photo1 => '',
@@ -269,7 +269,7 @@ for my $test (
             password_sign_in => '',
         },
         changes => {
-            rznvy => 'test@example.com',
+            username => 'test@example.com',
         },
         field_errors => [ 'Please enter a message', 'Please enter your name' ]
     },
@@ -297,7 +297,7 @@ for my $test (
         desc => 'submit an update for a non registered user',
         initial_values => {
             name          => '',
-            rznvy         => '',
+            username => '',
             may_show_name => 1,
             add_alert     => 1,
             photo1 => '',
@@ -311,7 +311,7 @@ for my $test (
         },
         form_values => {
             submit_update => 1,
-            rznvy         => 'unregistered@example.com',
+            username => 'unregistered@example.com',
             update        => 'Update from an unregistered user',
             add_alert     => undef,
             name          => 'Unreg User',
@@ -323,7 +323,7 @@ for my $test (
         desc => 'submit an update for a non registered user and sign up',
         initial_values => {
             name          => '',
-            rznvy         => '',
+            username => '',
             may_show_name => 1,
             add_alert     => 1,
             photo1 => '',
@@ -337,7 +337,7 @@ for my $test (
         },
         form_values => {
             submit_update => 1,
-            rznvy         => 'unregistered@example.com',
+            username => 'unregistered@example.com',
             update        => "update from an\r\n\r\nunregistered user",
             add_alert     => 1,
             name          => 'Unreg User',
@@ -395,14 +395,14 @@ for my $test (
 
         ok $update, 'found update in database';
         is $update->state, 'unconfirmed', 'update unconfirmed';
-        is $update->user->email, $details->{rznvy}, 'update email';
+        is $update->user->email, $details->{username}, 'update email';
         is $update->text, $details->{update}, 'update text';
         is $add_alerts, $details->{add_alert} ? 1 : 0, 'do not sign up for alerts';
 
         $mech->get_ok( $url );
         $mech->content_contains("/report/$report_id#update_$update_id");
 
-        my $unreg_user = FixMyStreet::App->model( 'DB::User' )->find( { email => $details->{rznvy} } );
+        my $unreg_user = FixMyStreet::App->model( 'DB::User' )->find( { email => $details->{username} } );
 
         ok $unreg_user, 'found user';
 
@@ -427,7 +427,7 @@ for my $test (
         desc => 'overriding email confirmation allows report confirmation with no email sent',
         initial_values => {
             name          => '',
-            rznvy         => '',
+            username => '',
             may_show_name => 1,
             add_alert     => 1,
             photo1 => '',
@@ -441,7 +441,7 @@ for my $test (
         },
         form_values => {
             submit_update => 1,
-            rznvy         => 'unregistered@example.com',
+            username => 'unregistered@example.com',
             update        => "update no email confirm",
             add_alert     => 1,
             name          => 'Unreg User',
@@ -493,10 +493,10 @@ for my $test (
 
         ok $update, 'found update in database';
         is $update->state, 'confirmed', 'update confirmed';
-        is $update->user->email, $details->{rznvy}, 'update email';
+        is $update->user->email, $details->{username}, 'update email';
         is $update->text, $details->{update}, 'update text';
 
-        my $unreg_user = FixMyStreet::App->model( 'DB::User' )->find( { email => $details->{rznvy} } );
+        my $unreg_user = FixMyStreet::App->model( 'DB::User' )->find( { email => $details->{username} } );
 
         ok $unreg_user, 'found user';
 
@@ -972,13 +972,13 @@ for my $test (
         desc => 'submit an update for a registered user, signing in with wrong password',
         form_values => {
             submit_update => 1,
-            rznvy         => 'registered@example.com',
+            username => 'registered@example.com',
             update        => 'Update from a user',
             add_alert     => undef,
             password_sign_in => 'secret',
         },
         field_errors => [
-            "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the \x{2018}sign in by email\x{2019} section of the form.",
+            "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the \x{2018}No\x{2019} section of the form.",
             'Please enter your name', # FIXME Not really necessary error
         ],
     },
@@ -986,7 +986,7 @@ for my $test (
         desc => 'submit an update for a registered user and sign in',
         form_values => {
             submit_update => 1,
-            rznvy         => 'registered@example.com',
+            username => 'registered@example.com',
             update        => 'Update from a user',
             add_alert     => undef,
             password_sign_in => 'secret2',
@@ -996,7 +996,7 @@ for my $test (
 ) {
     subtest $test->{desc} => sub {
         # Set things up
-        my $user = $mech->create_user_ok( $test->{form_values}->{rznvy} );
+        my $user = $mech->create_user_ok( $test->{form_values}->{username} );
         my $pw = 'secret2';
         $user->update( { name => 'Mr Reg', password => $pw } );
         $report->comments->delete;
@@ -1036,7 +1036,7 @@ for my $test (
             my $update = $report->comments->first;
             ok $update, 'found update';
             is $update->text, $test->{form_values}->{update}, 'update text';
-            is $update->user->email, $test->{form_values}->{rznvy}, 'update user';
+            is $update->user->email, $test->{form_values}->{username}, 'update user';
             is $update->state, 'confirmed', 'update confirmed';
             $mech->delete_user( $update->user );
         }
@@ -1053,7 +1053,7 @@ subtest 'submit an update for a registered user, creating update by email' => su
     $mech->submit_form_ok( {
         with_fields => {
             submit_update => 1,
-            rznvy         => 'registered@example.com',
+            username => 'registered@example.com',
             update        => 'Update from a user',
             add_alert     => undef,
             name          => 'New Name',
@@ -1502,7 +1502,7 @@ for my $test (
         fields => {
             submit_update => 1,
             name          => 'Test User',
-            rznvy         => 'test@example.com',
+            username => 'test@example.com',
             may_show_name => 1,
             update        => 'update from owner',
             add_alert     => undef,
@@ -1524,7 +1524,7 @@ for my $test (
             submit_update => 1,
             name          => 'Test User',
             may_show_name => 1,
-            rznvy         => 'test@example.com',
+            username => 'test@example.com',
             update        => 'update from owner',
             add_alert     => undef,
             fixed         => 1,
@@ -1589,7 +1589,7 @@ for my $test (
         my $update = $report->comments->first;
         ok $update, 'found update';
         is $update->text, $results->{update}, 'update text';
-        is $update->user->email, $test->{fields}->{rznvy}, 'update user';
+        is $update->user->email, $test->{fields}->{username}, 'update user';
         is $update->state, 'unconfirmed', 'update confirmed';
         is $update->anonymous, $test->{anonymous}, 'user anonymous';