Bug 21576: Preserve chomp chars for USE raw

See bug 21526 comments 5-7

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/t/lib/QA/TemplateFilters.pm b/t/lib/QA/TemplateFilters.pm
index 0a3fa44..f2009cc 100644 (file)
--- a/t/lib/QA/TemplateFilters.pm
+++ b/t/lib/QA/TemplateFilters.pm
@@ -67,7 +67,7 @@ sub _process_tt_content {
             }
 
             $has_use_raw++
-              if $line =~ m{\[% USE raw %\]};    # Does [% Use raw %] exist?
+              if $line =~ m{\[%(\s|-|~)*USE raw(\s|-|~)*%\]};    # Does [% Use raw %] exist?
 
             my $e;
             if ( $line =~ qr{<a href="([^"]+)} ) {

diff --git a/t/template_filters.t b/t/template_filters.t
index c4bb841..33e1af9 100644 (file)
--- a/t/template_filters.t
+++ b/t/template_filters.t
@@ -171,7 +171,7 @@ EXPECTED
 subtest 'Preserve pre/post chomps' => sub {
     plan tests => 1;
     my $input = <<INPUT;
-[% USE raw %]
+[%- USE raw -%]
 [%- var -%]
 [% - var - %]
 [%~ var ~%]
@@ -182,7 +182,7 @@ subtest 'Preserve pre/post chomps' => sub {
 [%~ var | uri ~%]
 INPUT
     my $expected = <<EXPECTED;
-[% USE raw %]
+[%- USE raw -%]
 [%- var | html -%]
 [%- var | html -%]
 [%~ var | html ~%]