Merge branch '642-new-report-flow-changes'

5 files changed, 4 insertions, 56 deletions

diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 133dc8047..b796578a0 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -144,11 +144,9 @@ foreach my $test (
             name          => '',
             may_show_name => '1',
             username      => '',
-            email         => '',
             phone         => '',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {},
         errors  => [
@@ -171,12 +169,10 @@ foreach my $test (
             name          => '',
             may_show_name => '1',
             username      => '',
-            email         => '',
             phone         => '',
             category      => 'Something bad',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {
             category => '-- Pick a category --',
@@ -201,12 +197,10 @@ foreach my $test (
             name          => '',
             may_show_name => '1',
             username      => '',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {},
         errors  => [
@@ -228,12 +222,10 @@ foreach my $test (
             name          => '',
             may_show_name => undef,
             username      => '',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {},
         errors  => [
@@ -255,12 +247,10 @@ foreach my $test (
             name          => 'Bob Jones',
             may_show_name => undef,
             username      => '',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {},
         errors  => [
@@ -281,12 +271,10 @@ foreach my $test (
             name          => 'Bob Jones',
             may_show_name => '1',
             username      => '',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {},
         errors  => [
@@ -307,12 +295,10 @@ foreach my $test (
             name          => 'Bob Jones',
             may_show_name => '1',
             username      => '',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {
             title => 'Dog poo on walls',
@@ -333,12 +319,10 @@ foreach my $test (
             name          => 'DUDE',
             may_show_name => '1',
             username      => '',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {},
         errors  => [
@@ -358,12 +342,10 @@ foreach my $test (
             name          => 'anonymous',
             may_show_name => '1',
             username      => '',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {},
         errors  => [
@@ -383,14 +365,12 @@ foreach my $test (
             name          => 'Joe Smith',
             may_show_name => '1',
             username      => 'not an email',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
-        changes => { username => 'notanemail', email => 'notanemail' },
+        changes => { username => 'notanemail' },
         errors  => [ 'Please enter a valid email', ],
     },
     {
@@ -405,12 +385,10 @@ foreach my $test (
             name          => '',
             may_show_name => '1',
             username      => '',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {
             title  => 'Test title',
@@ -433,17 +411,14 @@ foreach my $test (
             name          => '  Bob    Jones   ',
             may_show_name => '1',
             username      => '   BOB @ExAmplE.COM   ',
-            email         => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {
             name  => 'Bob Jones',
             username => 'bob@example.com',
-            email => 'bob@example.com',
         },
         errors => [ 'Please enter a subject', 'Please enter some details', ],
     },
@@ -459,12 +434,10 @@ foreach my $test (
             name          => 'Bob Jones',
             may_show_name => '1',
             username      => 'bob@example.com',
-            email         => 'bob@example.com',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {
             photo1 => '',
@@ -483,12 +456,10 @@ foreach my $test (
             name          => 'Bob Jones',
             may_show_name => '1',
             username      => 'bob@example.com',
-            email         => 'bob@example.com',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {
             photo1 => '',
@@ -507,12 +478,10 @@ foreach my $test (
             name          => 'Bob Jones',
             may_show_name => '1',
             username      => 'bob@example.com',
-            email         => 'bob@example.com',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => {
             photo1 => '',
@@ -532,12 +501,10 @@ foreach my $test (
             name          => 'Bob Example',
             may_show_name => '1',
             username      => 'bob@example.com',
-            email         => 'bob@example.com',
             phone         => '',
             category      => 'Trees',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => { },
         errors => [ 'Please enter a subject', 'Reports are limited to 1750 characters in length. Please shorten your report' ],
@@ -554,12 +521,10 @@ foreach my $test (
             name          => 'Bob Example',
             may_show_name => '1',
             username      => 'bob@example.com',
-            email         => 'bob@example.com',
             phone         => '',
             category      => 'Trees',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => { },
         errors => [ 'Please enter a subject', 'Reports are limited to 1700 characters in length. Please shorten your report' ],
@@ -576,12 +541,10 @@ foreach my $test (
             name          => 'Bob Example',
             may_show_name => '1',
             username      => 'bob@example.com',
-            email         => 'bob@example.com',
             phone         => '123456789 12345678910',
             category      => 'Trees',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => { },
         errors => [ 'Please enter a subject', 'Phone numbers are limited to 20 characters in length.' ],
@@ -598,12 +561,10 @@ foreach my $test (
             name          => 'This is a very long name that should fail validation',
             may_show_name => '1',
             username      => 'bob@example.com',
-            email         => 'bob@example.com',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => { },
         errors => [ 'Please enter a subject', 'Please enter some details', 'Names are limited to 50 characters in length.' ],
@@ -620,12 +581,10 @@ foreach my $test (
             name          => 'This is a very long name that should fail validation',
             may_show_name => '1',
             username      => 'bob@example.com',
-            email         => 'bob@example.com',
             phone         => '',
             category      => 'Trees',
             password_sign_in => '',
             password_register => '',
-            remember_me => undef,
         },
         changes => { },
         errors => [ 'Please enter a subject', 'Please enter some details', 'Names are limited to 40 characters in length.' ],
@@ -1360,7 +1319,7 @@ subtest "check map click ajax response" => sub {
     };
     ok $extra_details->{titles_list}, 'Bromley sends back list of titles';
     like $extra_details->{councils_text}, qr/Bromley Council/, 'correct council text';
-    like $extra_details->{councils_text_private}, qr/^These will be sent to the council, but will never be shown online/, 'correct private council text';
+    like $extra_details->{councils_text_private}, qr/^These details will be sent to the council, but will never be shown online/, 'correct private council text';
     like $extra_details->{category}, qr/Trees/, 'category looks correct';
     is_deeply $extra_details->{bodies}, [ "Bromley Council" ], 'correct bodies';
     ok !$extra_details->{contribute_as}, 'no contribute as section';
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index 7d4f5429f..22b4409b5 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -73,12 +73,10 @@ my $empty_form = {
     name          => '',
     may_show_name => '1',
     username      => '',
-    email         => '',
     phone         => '',
     category      => '',
     password_sign_in => '',
     password_register => '',
-    remember_me => undef,
 };
 foreach my $test (
     {
diff --git a/t/app/controller/report_new_text.t b/t/app/controller/report_new_text.t
index 8b7805c31..e6f0a9017 100644
--- a/t/app/controller/report_new_text.t
+++ b/t/app/controller/report_new_text.t
@@ -23,7 +23,7 @@ foreach my $test (
             username => '0121 4960000000', email => '', phone => '',
             title => 'Title', detail => 'Detail', name => 'Bob Jones',
             category => 'Street lighting',
-            may_show_name => '1', remember_me => undef,
+            may_show_name => '1',
             photo1 => '', photo2 => '', photo3 => '',
             password_register => '', password_sign_in => '',
         },
@@ -40,7 +40,7 @@ foreach my $test (
             username => '0121 4960000', email => '', phone => '',
             title => 'Title', detail => 'Detail', name => 'Bob Jones',
             category => 'Street lighting',
-            may_show_name => '1', remember_me => undef,
+            may_show_name => '1',
             photo1 => '', photo2 => '', photo3 => '',
             password_register => '', password_sign_in => '',
         },
diff --git a/t/app/controller/report_update_text.t b/t/app/controller/report_update_text.t
index a3b767221..4ab8e4bae 100644
--- a/t/app/controller/report_update_text.t
+++ b/t/app/controller/report_update_text.t
@@ -71,7 +71,6 @@ for my $test (
             fixed => undef,
             add_alert => 1,
             may_show_name => undef,
-            remember_me => undef,
             password_sign_in => '',
             password_register => '',
         },
@@ -90,7 +89,6 @@ for my $test (
             fixed => undef,
             add_alert => 1,
             may_show_name => undef,
-            remember_me => undef,
             password_register => '',
             password_sign_in => '',
         },
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index f49330f34..9a95c296e 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -263,7 +263,6 @@ for my $test (
             fixed  => undef,
             add_alert => 1,
             may_show_name => undef,
-            remember_me => undef,
             password_register => '',
             password_sign_in => '',
         },
@@ -282,7 +281,6 @@ for my $test (
             fixed  => undef,
             add_alert => 1,
             may_show_name => undef,
-            remember_me => undef,
             password_sign_in => '',
             password_register => '',
         },
@@ -301,7 +299,6 @@ for my $test (
             fixed  => undef,
             add_alert => 1,
             may_show_name => undef,
-            remember_me => undef,
             password_register => '',
             password_sign_in => '',
         },
@@ -322,7 +319,6 @@ for my $test (
             fixed  => undef,
             add_alert => 1,
             may_show_name => undef,
-            remember_me => undef,
             password_register => '',
             password_sign_in => '',
         },
@@ -363,7 +359,6 @@ for my $test (
             photo3 => '',
             update        => '',
             fixed         => undef,
-            remember_me => undef,
             password_register => '',
             password_sign_in => '',
         },
@@ -389,7 +384,6 @@ for my $test (
             photo3 => '',
             update        => '',
             fixed         => undef,
-            remember_me => undef,
             password_register => '',
             password_sign_in => '',
         },
@@ -493,7 +487,6 @@ for my $test (
             photo3 => '',
             update        => '',
             fixed         => undef,
-            remember_me => undef,
             password_register => '',
             password_sign_in => '',
         },