diff options
author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2019-11-09 05:24:57 +0000 |
---|---|---|
committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2019-11-09 05:24:57 +0000 |
commit | 09af8e66836a9084a483b552fe7341f72d8a81fb (patch) | |
tree | 8cf8faf34acd7df062885d6c99e5318ea0a343be /test/unit | |
parent | fae40298d8a512b95877e4d2703233c9132fcefb (diff) | |
download | redmine-09af8e66836a9084a483b552fe7341f72d8a81fb.tar.gz redmine-09af8e66836a9084a483b552fe7341f72d8a81fb.zip |
cleanup: rubocop: fix Layout/ClosingHeredocIndentation and Layout/IndentHeredoc in test/unit/lib/redmine/wiki_formatting/macros_test.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@18987 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit')
-rw-r--r-- | test/unit/lib/redmine/wiki_formatting/macros_test.rb | 84 |
1 files changed, 40 insertions, 44 deletions
diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb index ddf53f582..208c0157a 100644 --- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb @@ -243,15 +243,15 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest def test_macro_collapse_should_not_break_toc set_language_if_valid 'en' - text = <<-RAW -{{toc}} + text = <<~RAW + {{toc}} -h1. Title + h1. Title -{{collapse(Show example, Hide example) -h2. Heading -}}" -RAW + {{collapse(Show example, Hide example) + h2. Heading + }}" + RAW expected_toc = '<ul class="toc"><li><strong>Table of contents</strong></li><li><a href="#Title">Title</a><ul><li><a href="#Heading">Heading</a></li></ul></li></ul>' @@ -350,28 +350,26 @@ RAW end def test_macros_should_not_be_executed_in_pre_tags - text = <<-RAW -{{hello_world(foo)}} - -<pre> -{{hello_world(pre)}} -!{{hello_world(pre)}} -</pre> - -{{hello_world(bar)}} -RAW - - expected = <<-EXPECTED -<p>Hello world! Object: NilClass, Arguments: foo and no block of text.</p> - -<pre> -{{hello_world(pre)}} -!{{hello_world(pre)}} -</pre> - -<p>Hello world! Object: NilClass, Arguments: bar and no block of text.</p> -EXPECTED - + text = <<~RAW + {{hello_world(foo)}} + + <pre> + {{hello_world(pre)}} + !{{hello_world(pre)}} + </pre> + + {{hello_world(bar)}} + RAW + expected = <<~EXPECTED + <p>Hello world! Object: NilClass, Arguments: foo and no block of text.</p> + + <pre> + {{hello_world(pre)}} + !{{hello_world(pre)}} + </pre> + + <p>Hello world! Object: NilClass, Arguments: bar and no block of text.</p> + EXPECTED assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(text).gsub(%r{[\r\n\t]}, '') end @@ -386,21 +384,19 @@ EXPECTED end def test_macros_with_text_should_not_mangle_following_macros - text = <<-RAW -{{hello_world -Line of text -}} - -{{hello_world -Another line of text -}} -RAW - - expected = <<-EXPECTED -<p>Hello world! Object: NilClass, Called with no argument and a 12 bytes long block of text.</p> -<p>Hello world! Object: NilClass, Called with no argument and a 20 bytes long block of text.</p> -EXPECTED - + text = <<~RAW + {{hello_world + Line of text + }} + + {{hello_world + Another line of text + }} + RAW + expected = <<~EXPECTED + <p>Hello world! Object: NilClass, Called with no argument and a 12 bytes long block of text.</p> + <p>Hello world! Object: NilClass, Called with no argument and a 20 bytes long block of text.</p> + EXPECTED assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(text).gsub(%r{[\r\n\t]}, '') end |