From 97c3f1e56624bc1b728b237455203e8f9898eb48 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 18 Oct 2018 14:33:04 +0100 Subject: =?UTF-8?q?Remove=20=E2=80=9CKeep=20me=20signed=20in=E2=80=9D=20bo?= =?UTF-8?q?x.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- t/app/controller/report_new.t | 20 -------------------- t/app/controller/report_new_open311.t | 1 - t/app/controller/report_new_text.t | 4 ++-- t/app/controller/report_update_text.t | 2 -- t/app/controller/report_updates.t | 7 ------- 5 files changed, 2 insertions(+), 32 deletions(-) (limited to 't/app/controller') diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 133dc8047..8568e2e68 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -148,7 +148,6 @@ foreach my $test ( phone => '', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => {}, errors => [ @@ -176,7 +175,6 @@ foreach my $test ( category => 'Something bad', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => { category => '-- Pick a category --', @@ -206,7 +204,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => {}, errors => [ @@ -233,7 +230,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => {}, errors => [ @@ -260,7 +256,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => {}, errors => [ @@ -286,7 +281,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => {}, errors => [ @@ -312,7 +306,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => { title => 'Dog poo on walls', @@ -338,7 +331,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => {}, errors => [ @@ -363,7 +355,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => {}, errors => [ @@ -388,7 +379,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => { username => 'notanemail', email => 'notanemail' }, errors => [ 'Please enter a valid email', ], @@ -410,7 +400,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => { title => 'Test title', @@ -438,7 +427,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => { name => 'Bob Jones', @@ -464,7 +452,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => { photo1 => '', @@ -488,7 +475,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => { photo1 => '', @@ -512,7 +498,6 @@ foreach my $test ( category => 'Street lighting', password_sign_in => '', password_register => '', - remember_me => undef, }, changes => { photo1 => '', @@ -537,7 +522,6 @@ foreach my $test ( 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' ], @@ -559,7 +543,6 @@ foreach my $test ( 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' ], @@ -581,7 +564,6 @@ foreach my $test ( 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.' ], @@ -603,7 +585,6 @@ foreach my $test ( 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.' ], @@ -625,7 +606,6 @@ foreach my $test ( 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.' ], diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t index 7d4f5429f..e710e8ca8 100644 --- a/t/app/controller/report_new_open311.t +++ b/t/app/controller/report_new_open311.t @@ -78,7 +78,6 @@ my $empty_form = { 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 => '', }, -- cgit v1.2.3 From bfdae7620a932a5fe11ffdb94c586d8f648f2d51 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 18 Oct 2018 14:33:28 +0100 Subject: Do not show second email form if SMS_AUTHENTICATION off. --- t/app/controller/report_new.t | 23 +---------------------- t/app/controller/report_new_open311.t | 1 - 2 files changed, 1 insertion(+), 23 deletions(-) (limited to 't/app/controller') diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 8568e2e68..8a391f318 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -144,7 +144,6 @@ foreach my $test ( name => '', may_show_name => '1', username => '', - email => '', phone => '', password_sign_in => '', password_register => '', @@ -170,7 +169,6 @@ foreach my $test ( name => '', may_show_name => '1', username => '', - email => '', phone => '', category => 'Something bad', password_sign_in => '', @@ -199,7 +197,6 @@ foreach my $test ( name => '', may_show_name => '1', username => '', - email => '', phone => '', category => 'Street lighting', password_sign_in => '', @@ -225,7 +222,6 @@ foreach my $test ( name => '', may_show_name => undef, username => '', - email => '', phone => '', category => 'Street lighting', password_sign_in => '', @@ -251,7 +247,6 @@ foreach my $test ( name => 'Bob Jones', may_show_name => undef, username => '', - email => '', phone => '', category => 'Street lighting', password_sign_in => '', @@ -276,7 +271,6 @@ foreach my $test ( name => 'Bob Jones', may_show_name => '1', username => '', - email => '', phone => '', category => 'Street lighting', password_sign_in => '', @@ -301,7 +295,6 @@ foreach my $test ( name => 'Bob Jones', may_show_name => '1', username => '', - email => '', phone => '', category => 'Street lighting', password_sign_in => '', @@ -326,7 +319,6 @@ foreach my $test ( name => 'DUDE', may_show_name => '1', username => '', - email => '', phone => '', category => 'Street lighting', password_sign_in => '', @@ -350,7 +342,6 @@ foreach my $test ( name => 'anonymous', may_show_name => '1', username => '', - email => '', phone => '', category => 'Street lighting', password_sign_in => '', @@ -374,13 +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 => '', }, - changes => { username => 'notanemail', email => 'notanemail' }, + changes => { username => 'notanemail' }, errors => [ 'Please enter a valid email', ], }, { @@ -395,7 +385,6 @@ foreach my $test ( name => '', may_show_name => '1', username => '', - email => '', phone => '', category => 'Street lighting', password_sign_in => '', @@ -422,7 +411,6 @@ foreach my $test ( name => ' Bob Jones ', may_show_name => '1', username => ' BOB @ExAmplE.COM ', - email => '', phone => '', category => 'Street lighting', password_sign_in => '', @@ -431,7 +419,6 @@ foreach my $test ( changes => { name => 'Bob Jones', username => 'bob@example.com', - email => 'bob@example.com', }, errors => [ 'Please enter a subject', 'Please enter some details', ], }, @@ -447,7 +434,6 @@ 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 => '', @@ -470,7 +456,6 @@ 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 => '', @@ -493,7 +478,6 @@ 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 => '', @@ -517,7 +501,6 @@ foreach my $test ( name => 'Bob Example', may_show_name => '1', username => 'bob@example.com', - email => 'bob@example.com', phone => '', category => 'Trees', password_sign_in => '', @@ -538,7 +521,6 @@ foreach my $test ( name => 'Bob Example', may_show_name => '1', username => 'bob@example.com', - email => 'bob@example.com', phone => '', category => 'Trees', password_sign_in => '', @@ -559,7 +541,6 @@ 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 => '', @@ -580,7 +561,6 @@ 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 => '', @@ -601,7 +581,6 @@ 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 => '', diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t index e710e8ca8..22b4409b5 100644 --- a/t/app/controller/report_new_open311.t +++ b/t/app/controller/report_new_open311.t @@ -73,7 +73,6 @@ my $empty_form = { name => '', may_show_name => '1', username => '', - email => '', phone => '', category => '', password_sign_in => '', -- cgit v1.2.3 From c21b8a0455ae1416887e89358b945322edd761ed Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 18 Oct 2018 18:30:22 +0100 Subject: Update sign in flow for new reports/updates. Co-authored-by: Zarino Zappia --- t/app/controller/report_new.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/app/controller') diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 8a391f318..b796578a0 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -1319,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'; -- cgit v1.2.3