diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
| commit | 592924059a07a5a30e8a09dfc4ca8dea56c5c77a (patch) | |
| tree | c99e86d3e3f780427bbf7a9ec0ae5187b697dfa5 /t/app/controller/report_updates.t | |
| parent | 65066d275557e16448aa99ecdfa4df62d4d79649 (diff) | |
| parent | d92bbef188eff6c14adf0f0c7b032846b1be85a6 (diff) | |
Merge remote-tracking branch 'origin/master' into send-report-rewrite
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 't/app/controller/report_updates.t')
| -rw-r--r-- | t/app/controller/report_updates.t | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 39cb5d6d8..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 ], }, @@ -826,7 +826,7 @@ for my $test ( update => 'Update from a registered user' }, initial_banner => undef, - endstate_banner => ' This problem has been fixed. ', + endstate_banner => 'Fixed', alert => 1, anonymous => 0, }, @@ -848,8 +848,8 @@ for my $test ( changed => { update => 'Another update from a registered user' }, - initial_banner => ' This problem has been fixed. ', - endstate_banner => ' This problem has been fixed. ', + initial_banner => 'Fixed', + endstate_banner => 'Fixed', alert => 0, anonymous => 0, }, @@ -953,7 +953,7 @@ foreach my $test ( fixed => 1, }, changed => { update => 'Update from owner' }, - initial_banner => ' This problem is in progress. ', + initial_banner => 'In progress', initial_state => 'in progress', alert => 1, # we signed up for alerts before, do not unsign us anonymous => 0, |