aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/FixMyStreet/TestMech.pm25
-rw-r--r--t/app/controller/report_new.t20
-rw-r--r--t/app/controller/report_new_open311.t1
-rw-r--r--t/app/controller/report_new_text.t4
-rw-r--r--t/app/controller/report_update_text.t2
-rw-r--r--t/app/controller/report_updates.t7
-rw-r--r--templates/web/base/auth/2faform.html1
-rw-r--r--templates/web/base/report/new/form_user_loggedout_password.html5
-rw-r--r--templates/web/base/report/update/form_user_loggedout_password.html5
-rw-r--r--templates/web/bromley/report/new/form_user_loggedout_password.html5
-rw-r--r--templates/web/bromley/report/update/form_user_loggedout_password.html5
-rw-r--r--templates/web/fixamingata/report/new/form_user_loggedout.html5
12 files changed, 2 insertions, 83 deletions
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index 495310063..b8605f56c 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -537,31 +537,6 @@ sub visible_form_values {
return \%params;
}
-=head2 session_cookie_expiry
-
- $expiry = $mech->session_cookie_expiry( );
-
-Returns the current expiry time for the session cookie. Might be '0' which
-indicates it expires at end of browser session.
-
-=cut
-
-sub session_cookie_expiry {
- my $mech = shift;
-
- my $cookie_name = 'fixmystreet_app_session';
- my $expires = 'not found';
-
- $mech #
- ->cookie_jar #
- ->scan( sub { $expires = $_[8] if $_[1] eq $cookie_name } );
-
- croak "Could not find cookie '$cookie_name'"
- if $expires && $expires eq 'not found';
-
- return $expires || 0;
-}
-
=head2 get_ok_json
$decoded = $mech->get_ok_json( $url );
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 => '',
},
diff --git a/templates/web/base/auth/2faform.html b/templates/web/base/auth/2faform.html
index 360883d49..bd6a7bd18 100644
--- a/templates/web/base/auth/2faform.html
+++ b/templates/web/base/auth/2faform.html
@@ -12,7 +12,6 @@
<input type="hidden" name="username" value="[% c.get_param('username') | html %]">
<input type="hidden" name="password_sign_in" value="[% c.get_param('password_sign_in') | html %]">
<input type="hidden" name="r" value="[% c.get_param('r') | html %]">
- <input type="hidden" name="remember_me" value="[% c.get_param('remember_me') | html %]">
<input type="hidden" name="token" value="[% token | html %]">
<label for="2fa_code">[% loc('Code') %]</label>
diff --git a/templates/web/base/report/new/form_user_loggedout_password.html b/templates/web/base/report/new/form_user_loggedout_password.html
index 16b6fdaad..0d4759e51 100644
--- a/templates/web/base/report/new/form_user_loggedout_password.html
+++ b/templates/web/base/report/new/form_user_loggedout_password.html
@@ -11,11 +11,6 @@
<input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]">
</div>
- <div class="checkbox-group">
- <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
- <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
- </div>
-
<div class="general-notes">
<p><strong>[% loc('Forgotten your password?') %]</strong>
[% loc('Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
diff --git a/templates/web/base/report/update/form_user_loggedout_password.html b/templates/web/base/report/update/form_user_loggedout_password.html
index c68163fa7..a359946fe 100644
--- a/templates/web/base/report/update/form_user_loggedout_password.html
+++ b/templates/web/base/report/update/form_user_loggedout_password.html
@@ -10,11 +10,6 @@
<input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Post') %]">
</div>
- <div class="checkbox-group">
- <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
- <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
- </div>
-
<div class="general-notes">
<p><strong>[% loc('Forgotten your password?') %]</strong>
[% loc('Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
diff --git a/templates/web/bromley/report/new/form_user_loggedout_password.html b/templates/web/bromley/report/new/form_user_loggedout_password.html
index 900fc5d9d..def5a51b7 100644
--- a/templates/web/bromley/report/new/form_user_loggedout_password.html
+++ b/templates/web/bromley/report/new/form_user_loggedout_password.html
@@ -10,9 +10,4 @@
<input class="form-control" type="password" name="password_sign_in" id="password_sign_in" value="">
<input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]">
</div>
-
- <div class="checkbox-group">
- <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
- <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
- </div>
</div>
diff --git a/templates/web/bromley/report/update/form_user_loggedout_password.html b/templates/web/bromley/report/update/form_user_loggedout_password.html
index c18b45ff0..adad6165f 100644
--- a/templates/web/bromley/report/update/form_user_loggedout_password.html
+++ b/templates/web/bromley/report/update/form_user_loggedout_password.html
@@ -10,9 +10,4 @@
<input class="form-control" type="password" name="password_sign_in" id="password_sign_in" value="">
<input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Post') %]">
</div>
-
- <div class="checkbox-group">
- <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
- <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
- </div>
</div>
diff --git a/templates/web/fixamingata/report/new/form_user_loggedout.html b/templates/web/fixamingata/report/new/form_user_loggedout.html
index cc869e2be..7dd539126 100644
--- a/templates/web/fixamingata/report/new/form_user_loggedout.html
+++ b/templates/web/fixamingata/report/new/form_user_loggedout.html
@@ -65,11 +65,6 @@
<input type="password" class="form-control" name="password_sign_in" id="password_sign_in" value="">
<input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]">
</div>
-
- <div class="checkbox-group">
- <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
- <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
- </div>
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 20:02:20 +0000