aboutsummaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
Diffstat (limited to 't')
-rw-r--r--t/app/controller/report_new.t2
-rw-r--r--t/app/controller/report_updates.t2
-rw-r--r--t/cobrand/loading.t8
3 files changed, 5 insertions, 7 deletions
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 6da9afa24..625c7531f 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -493,7 +493,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->form_errors, [
- 'There was a problem with your email/password combination. Passwords and user accounts are a brand new service, so you probably do not have one yet – please fill in the right hand side of this form to get one.'
+ "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.",
], "check there were errors";
};
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 99f1ba62d..9c2b0861b 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -604,7 +604,7 @@ for my $test (
password_sign_in => 'secret',
},
field_errors => [
- "There was a problem with your email/password combination. Passwords and user accounts are a brand new service, so you probably do not have one yet \x{2013} please fill in the right hand side of this form to get one.",
+ "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.",
'Please enter your name', # FIXME Not really necessary error
],
},
diff --git a/t/cobrand/loading.t b/t/cobrand/loading.t
index 405ef4761..bd83da07f 100644
--- a/t/cobrand/loading.t
+++ b/t/cobrand/loading.t
@@ -14,16 +14,14 @@ use_ok 'FixMyStreet::Cobrand';
ok $allowed, "got the allowed_cobrands";
isa_ok $allowed, "ARRAY";
cmp_ok scalar @$allowed, '>', 1, "got more than one";
- is join( '|', @$allowed ), FixMyStreet->config('ALLOWED_COBRANDS'),
- "matches config value";
}
# fake the allowed cobrands for testing
my $override = Sub::Override->new( #
- 'FixMyStreet::Cobrand::get_allowed_cobrands' =>
+ 'FixMyStreet::Cobrand::_get_allowed_cobrands' =>
sub { return ['emptyhomes'] }
);
-is_deeply FixMyStreet::Cobrand->get_allowed_cobrands, ['emptyhomes'],
+is_deeply FixMyStreet::Cobrand->get_allowed_cobrands, [ { moniker => 'emptyhomes', host => 'emptyhomes' } ],
'overidden get_allowed_cobrands';
sub run_host_tests {
@@ -45,7 +43,7 @@ run_host_tests(
# now enable barnet too and check that it works
$override->replace( #
- 'FixMyStreet::Cobrand::get_allowed_cobrands' =>
+ 'FixMyStreet::Cobrand::_get_allowed_cobrands' =>
sub { return [ 'emptyhomes', 'barnet' ] }
);