diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
| commit | 3b5d561700b184c20e63111d4cbc1daab78e16c6 (patch) | |
| tree | f0c53c6bf8d4ebf12e5388053ad856fb0d0e7b86 /t/app/controller/report_updates.t | |
| parent | 390f8e8ad1e10f832c4323c39bed2c883744a03f (diff) | |
| parent | f38b8e985697c35a62374a2f02dce2d681ef58cd (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/DB/Result/User.pm
t/app/controller/admin.t
templates/web/default/admin/update_edit.html
web/css/core.css
Diffstat (limited to 't/app/controller/report_updates.t')
| -rw-r--r-- | t/app/controller/report_updates.t | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index ec4aa7342..9606afc8e 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -324,13 +324,13 @@ for my $test ( form_values => { submit_update => 1, rznvy => 'unregistered@example.com', - update => 'update from an unregistered user', + update => "update from an\r\n\r\nunregistered user", add_alert => 1, name => 'Unreg User', may_show_name => undef, }, changes => { - update => 'Update from an unregistered user', + update => "Update from an\n\nUnregistered user", }, } ) { |