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_new.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_new.t')
| -rw-r--r-- | t/app/controller/report_new.t | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index f06c23501..fa188210a 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -151,8 +151,8 @@ foreach my $test ( msg => 'title and details tidied up', pc => 'SW1A 1AA', fields => { - title => 'DOG SHIT ON WALLS', - detail => 'on this portakabin - more of a portaloo HEH!!', + title => "DOG SHIT\r\nON WALLS", + detail => "on this portakabin -\r\n\r\nmore of a portaloo HEH!!", photo => '', name => 'Bob Jones', may_show_name => '1', @@ -166,7 +166,7 @@ foreach my $test ( changes => { title => 'Dog poo on walls', detail => - 'On this [portable cabin] - more of a [portable loo] HEH!!', + "On this [portable cabin] -\n\nMore of a [portable loo] HEH!!", }, errors => [ 'Please enter your email', ], }, |