diff options
| -rw-r--r-- | notes/INSTALL | 8 | ||||
| -rw-r--r-- | perllib/Utils.pm | 2 | ||||
| -rw-r--r-- | t/app/controller/report_new.t | 6 | ||||
| -rw-r--r-- | t/app/controller/report_updates.t | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/notes/INSTALL b/notes/INSTALL index 77e753185..261865700 100644 --- a/notes/INSTALL +++ b/notes/INSTALL @@ -61,10 +61,16 @@ helps maintain the fake cpan subset). If you need to add a module do it using: - module-manage.pl add Module::To::Add + module-manage.pl add Module::To::Add and it will update all the relevant bits. +Currently, you probably need to add EncodedColumn manually: + + module-manage.pl add DBIx::Class::EncodedColumn + +...because it's explicitly overridden in the code, which is fooling the installer. + If a module won't build (Test::WWW::Mechanize and HTTP::Server::Simple fail tests for me but the failures are not pertinent) then the module-manage script will bail out. Look in ~/.cpanm/build_log to see what went wrong. You can force diff --git a/perllib/Utils.pm b/perllib/Utils.pm index 39c251876..c9afff186 100644 --- a/perllib/Utils.pm +++ b/perllib/Utils.pm @@ -197,7 +197,7 @@ sub cleanup_text { } # Remove unneeded whitespace - my @lines = grep { m/\S/ } split m/\n\n/, $input; + my @lines = grep { m/\S/ } split m/(?:\r?\n){2,}/, $input; for (@lines) { $_ = trim_text($_); $_ = ucfirst $_; # start with capital 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', ], }, diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 3076a4564..856e7d763 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", }, } ) { |