cleanup: rubocop: fix Layout/ClosingHeredocIndentation and Layout/IndentHeredoc in...

git-svn-id: http://svn.redmine.org/redmine/trunk@19020 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 11c6ad0d1d73e9ebc868404cb9b6a22ffb1efcd3..8ff28c136daa2b4d2451e51987e4185b3781352c 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -36,7 +36,6 @@ Layout/CaseIndentation:
 # Cop supports --auto-correct.
 Layout/ClosingHeredocIndentation:
   Exclude:
-    - 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb'
     - 'test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb'
     - 'test/unit/lib/redmine/wiki_formatting_test.rb'
 
@@ -151,7 +150,6 @@ Layout/IndentFirstHashElement:
 # SupportedStyles: squiggly, active_support, powerpack, unindent
 Layout/IndentHeredoc:
   Exclude:
-    - 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb'
     - 'test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb'
     - 'test/unit/lib/redmine/wiki_formatting_test.rb'
 

diff --git a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
index be667c89084754ed6ca1079ea2eb94412a357e9e..f52f1a169c93e148925b3fb59fc947aa1fc84a0a 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
@@ -61,23 +61,23 @@ class Redmine::WikiFormatting::MarkdownFormatterTest < ActionView::TestCase
   end
 
   def test_should_support_syntax_highlight
-    text = <<-STR
-~~~ruby
-def foo
-end
-~~~
-STR
+    text = <<~STR
+      ~~~ruby
+      def foo
+      end
+      ~~~
+    STR
     assert_select_in @formatter.new(text).to_html, 'pre code.ruby.syntaxhl' do
       assert_select 'span.k', :text => 'def'
     end
   end
 
   def test_should_not_allow_invalid_language_for_code_blocks
-    text = <<-STR
-~~~foo
-test
-~~~
-STR
+    text = <<~STR
+      ~~~foo
+      test
+      ~~~
+    STR
     assert_equal "<pre>test\n</pre>", @formatter.new(text).to_html
   end
 
@@ -92,35 +92,33 @@ STR
   end
 
   def test_markdown_should_not_require_surrounded_empty_line
-    text = <<-STR
-This is a list:
-* One
-* Two
-STR
+    text = <<~STR
+      This is a list:
+      * One
+      * Two
+    STR
     assert_equal "<p>This is a list:</p>\n\n<ul>\n<li>One</li>\n<li>Two</li>\n</ul>", @formatter.new(text).to_html.strip
   end
 
   def test_footnotes
-    text = <<-STR
-This is some text[^1].
-
-[^1]: This is the foot note
-STR
-
-    expected = <<-EXPECTED
-<p>This is some text<sup id="fnref1"><a href="#fn1">1</a></sup>.</p>
-<div class="footnotes">
-<hr>
-<ol>
-
-<li id="fn1">
-<p>This is the foot note&nbsp;<a href="#fnref1">&#8617;</a></p>
-</li>
-
-</ol>
-</div>
-EXPECTED
+    text = <<~STR
+      This is some text[^1].
 
+      [^1]: This is the foot note
+    STR
+    expected = <<~EXPECTED
+      <p>This is some text<sup id="fnref1"><a href="#fn1">1</a></sup>.</p>
+      <div class="footnotes">
+      <hr>
+      <ol>
+
+      <li id="fn1">
+      <p>This is the foot note&nbsp;<a href="#fnref1">&#8617;</a></p>
+      </li>
+
+      </ol>
+      </div>
+    EXPECTED
     assert_equal expected.gsub(%r{[\r\n\t]}, ''), @formatter.new(text).to_html.gsub(%r{[\r\n\t]}, '')
   end