From 63fff600accb41b56a3e6ac403d9b1732de3086d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 6 Aug 2016 19:36:34 +0200
Subject: modernizes hash syntax in actionview

---
 actionview/test/template/text_helper_test.rb | 158 +++++++++++++--------------
 1 file changed, 79 insertions(+), 79 deletions(-)

(limited to 'actionview/test/template/text_helper_test.rb')

diff --git a/actionview/test/template/text_helper_test.rb b/actionview/test/template/text_helper_test.rb
index 8c866040d9..0317c433d1 100644
--- a/actionview/test/template/text_helper_test.rb
+++ b/actionview/test/template/text_helper_test.rb
@@ -38,8 +38,8 @@ class TextHelperTest < ActionView::TestCase
     text = "A\r\n  \nB\n\n\r\n\t\nC\nD".freeze
     assert_equal "<p>A\n<br />  \n<br />B</p>\n\n<p>\t\n<br />C\n<br />D</p>", simple_format(text)
 
-    assert_equal %q(<p class="test">This is a classy test</p>), simple_format("This is a classy test", :class => "test")
-    assert_equal %Q(<p class="test">para 1</p>\n\n<p class="test">para 2</p>), simple_format("para 1\n\npara 2", :class => "test")
+    assert_equal %q(<p class="test">This is a classy test</p>), simple_format("This is a classy test", class: "test")
+    assert_equal %Q(<p class="test">para 1</p>\n\n<p class="test">para 2</p>), simple_format("para 1\n\npara 2", class: "test")
   end
 
   def test_simple_format_should_sanitize_input_when_sanitize_option_is_not_false
@@ -52,15 +52,15 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_simple_format_should_not_sanitize_input_when_sanitize_option_is_false
-    assert_equal "<p><b> test with unsafe string </b><script>code!</script></p>", simple_format("<b> test with unsafe string </b><script>code!</script>", {}, :sanitize => false)
+    assert_equal "<p><b> test with unsafe string </b><script>code!</script></p>", simple_format("<b> test with unsafe string </b><script>code!</script>", {}, sanitize: false)
   end
 
   def test_simple_format_with_custom_wrapper
-    assert_equal "<div></div>", simple_format(nil, {}, :wrapper_tag => "div")
+    assert_equal "<div></div>", simple_format(nil, {}, wrapper_tag: "div")
   end
 
   def test_simple_format_with_custom_wrapper_and_multi_line_breaks
-    assert_equal "<div>We want to put a wrapper...</div>\n\n<div>...right there.</div>", simple_format("We want to put a wrapper...\n\n...right there.", {}, :wrapper_tag => "div")
+    assert_equal "<div>We want to put a wrapper...</div>\n\n<div>...right there.</div>", simple_format("We want to put a wrapper...\n\n...right there.", {}, wrapper_tag: "div")
   end
 
   def test_simple_format_should_not_change_the_text_passed
@@ -71,22 +71,22 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_simple_format_does_not_modify_the_html_options_hash
-    options = { :class => "foobar"}
+    options = { class: "foobar"}
     passed_options = options.dup
     simple_format("some text", passed_options)
     assert_equal options, passed_options
   end
 
   def test_simple_format_does_not_modify_the_options_hash
-    options = { :wrapper_tag => :div, :sanitize => false }
+    options = { wrapper_tag: :div, sanitize: false }
     passed_options = options.dup
     simple_format("some text", {}, passed_options)
     assert_equal options, passed_options
   end
 
   def test_truncate
-    assert_equal "Hello World!", truncate("Hello World!", :length => 12)
-    assert_equal "Hello Wor...", truncate("Hello World!!", :length => 12)
+    assert_equal "Hello World!", truncate("Hello World!", length: 12)
+    assert_equal "Hello Wor...", truncate("Hello World!!", length: 12)
   end
 
   def test_truncate_should_use_default_length_of_30
@@ -95,21 +95,21 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_truncate_with_options_hash
-    assert_equal "This is a string that wil[...]", truncate("This is a string that will go longer then the default truncate length of 30", :omission => "[...]")
-    assert_equal "Hello W...", truncate("Hello World!", :length => 10)
-    assert_equal "Hello[...]", truncate("Hello World!", :omission => "[...]", :length => 10)
-    assert_equal "Hello[...]", truncate("Hello Big World!", :omission => "[...]", :length => 13, :separator => " ")
-    assert_equal "Hello Big[...]", truncate("Hello Big World!", :omission => "[...]", :length => 14, :separator => " ")
-    assert_equal "Hello Big[...]", truncate("Hello Big World!", :omission => "[...]", :length => 15, :separator => " ")
+    assert_equal "This is a string that wil[...]", truncate("This is a string that will go longer then the default truncate length of 30", omission: "[...]")
+    assert_equal "Hello W...", truncate("Hello World!", length: 10)
+    assert_equal "Hello[...]", truncate("Hello World!", omission: "[...]", length: 10)
+    assert_equal "Hello[...]", truncate("Hello Big World!", omission: "[...]", length: 13, separator: " ")
+    assert_equal "Hello Big[...]", truncate("Hello Big World!", omission: "[...]", length: 14, separator: " ")
+    assert_equal "Hello Big[...]", truncate("Hello Big World!", omission: "[...]", length: 15, separator: " ")
   end
 
   def test_truncate_multibyte
     assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding(Encoding::UTF_8),
-      truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding(Encoding::UTF_8), :length => 10)
+      truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding(Encoding::UTF_8), length: 10)
   end
 
   def test_truncate_does_not_modify_the_options_hash
-    options = { :length => 10 }
+    options = { length: 10 }
     passed_options = options.dup
     truncate("some text", passed_options)
     assert_equal options, passed_options
@@ -117,49 +117,49 @@ class TextHelperTest < ActionView::TestCase
 
   def test_truncate_with_link_options
     assert_equal "Here is a long test and ...<a href=\"#\">Continue</a>",
-    truncate("Here is a long test and I need a continue to read link", :length => 27) { link_to "Continue", "#" }
+    truncate("Here is a long test and I need a continue to read link", length: 27) { link_to "Continue", "#" }
   end
 
   def test_truncate_should_be_html_safe
-    assert truncate("Hello World!", :length => 12).html_safe?
+    assert truncate("Hello World!", length: 12).html_safe?
   end
 
   def test_truncate_should_escape_the_input
-    assert_equal "Hello &lt;sc...", truncate("Hello <script>code!</script>World!!", :length => 12)
+    assert_equal "Hello &lt;sc...", truncate("Hello <script>code!</script>World!!", length: 12)
   end
 
   def test_truncate_should_not_escape_the_input_with_escape_false
-    assert_equal "Hello <sc...", truncate("Hello <script>code!</script>World!!", :length => 12, :escape => false)
+    assert_equal "Hello <sc...", truncate("Hello <script>code!</script>World!!", length: 12, escape: false)
   end
 
   def test_truncate_with_escape_false_should_be_html_safe
-    truncated = truncate("Hello <script>code!</script>World!!", :length => 12, :escape => false)
+    truncated = truncate("Hello <script>code!</script>World!!", length: 12, escape: false)
     assert truncated.html_safe?
   end
 
   def test_truncate_with_block_should_be_html_safe
-    truncated = truncate("Here's a long test and I need a continue to read link", :length => 27) { link_to "Continue", "#" }
+    truncated = truncate("Here's a long test and I need a continue to read link", length: 27) { link_to "Continue", "#" }
     assert truncated.html_safe?
   end
 
   def test_truncate_with_block_should_escape_the_input
     assert_equal "&lt;script&gt;code!&lt;/script&gt;He...<a href=\"#\">Continue</a>",
-      truncate("<script>code!</script>Here's a long test and I need a continue to read link", :length => 27) { link_to "Continue", "#" }
+      truncate("<script>code!</script>Here's a long test and I need a continue to read link", length: 27) { link_to "Continue", "#" }
   end
 
   def test_truncate_with_block_should_not_escape_the_input_with_escape_false
     assert_equal "<script>code!</script>He...<a href=\"#\">Continue</a>",
-      truncate("<script>code!</script>Here's a long test and I need a continue to read link", :length => 27, :escape => false) { link_to "Continue", "#" }
+      truncate("<script>code!</script>Here's a long test and I need a continue to read link", length: 27, escape: false) { link_to "Continue", "#" }
   end
 
   def test_truncate_with_block_with_escape_false_should_be_html_safe
-    truncated = truncate("<script>code!</script>Here's a long test and I need a continue to read link", :length => 27, :escape => false) { link_to "Continue", "#" }
+    truncated = truncate("<script>code!</script>Here's a long test and I need a continue to read link", length: 27, escape: false) { link_to "Continue", "#" }
     assert truncated.html_safe?
   end
 
   def test_truncate_with_block_should_escape_the_block
     assert_equal "Here is a long test and ...&lt;script&gt;alert(&#39;foo&#39;);&lt;/script&gt;",
-      truncate("Here is a long test and I need a continue to read link", :length => 27) { "<script>alert('foo');</script>" }
+      truncate("Here is a long test and I need a continue to read link", length: 27) { "<script>alert('foo');</script>" }
   end
 
   def test_highlight_should_be_html_safe
@@ -179,7 +179,7 @@ class TextHelperTest < ActionView::TestCase
 
     assert_equal(
       "This is a <b>beautiful</b> morning, but also a <b>beautiful</b> day",
-      highlight("This is a beautiful morning, but also a beautiful day", "beautiful", :highlighter => '<b>\1</b>')
+      highlight("This is a beautiful morning, but also a beautiful day", "beautiful", highlighter: '<b>\1</b>')
     )
 
     assert_equal(
@@ -206,7 +206,7 @@ class TextHelperTest < ActionView::TestCase
   def test_highlight_should_not_sanitize_if_sanitize_option_if_false
     assert_equal(
       "This is a <mark>beautiful</mark> morning<script>code!</script>",
-      highlight("This is a beautiful morning<script>code!</script>", "beautiful", :sanitize => false)
+      highlight("This is a beautiful morning<script>code!</script>", "beautiful", sanitize: false)
     )
   end
 
@@ -233,7 +233,7 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_highlight_with_multiple_phrases_in_one_pass
-    assert_equal %(<em>wow</em> <em>em</em>), highlight("wow em", %w(wow em), :highlighter => '<em>\1</em>')
+    assert_equal %(<em>wow</em> <em>em</em>), highlight("wow em", %w(wow em), highlighter: '<em>\1</em>')
   end
 
   def test_highlight_with_html
@@ -259,12 +259,12 @@ class TextHelperTest < ActionView::TestCase
     )
     assert_equal(
       "<div>abc <b>div</b></div>",
-      highlight("<div>abc div</div>", "div", :highlighter => '<b>\1</b>')
+      highlight("<div>abc div</div>", "div", highlighter: '<b>\1</b>')
     )
   end
 
   def test_highlight_does_not_modify_the_options_hash
-    options = { :highlighter => '<b>\1</b>', :sanitize => false }
+    options = { highlighter: '<b>\1</b>', sanitize: false }
     passed_options = options.dup
     highlight("<div>abc div</div>", "div", passed_options)
     assert_equal options, passed_options
@@ -278,73 +278,73 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_excerpt
-    assert_equal("...is a beautiful morn...", excerpt("This is a beautiful morning", "beautiful", :radius => 5))
-    assert_equal("This is a...", excerpt("This is a beautiful morning", "this", :radius => 5))
-    assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", :radius => 5))
+    assert_equal("...is a beautiful morn...", excerpt("This is a beautiful morning", "beautiful", radius: 5))
+    assert_equal("This is a...", excerpt("This is a beautiful morning", "this", radius: 5))
+    assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", radius: 5))
     assert_nil excerpt("This is a beautiful morning", "day")
   end
 
   def test_excerpt_with_regex
-    assert_equal("...is a beautiful! mor...", excerpt("This is a beautiful! morning", "beautiful", :radius => 5))
-    assert_equal("...is a beautiful? mor...", excerpt("This is a beautiful? morning", "beautiful", :radius => 5))
-    assert_equal("...is a beautiful? mor...", excerpt("This is a beautiful? morning", /\bbeau\w*\b/i, :radius => 5))
-    assert_equal("...is a beautiful? mor...", excerpt("This is a beautiful? morning", /\b(beau\w*)\b/i, :radius => 5))
-    assert_equal("...udge Allen and...", excerpt("This day was challenging for judge Allen and his colleagues.", /\ballen\b/i, :radius => 5))
-    assert_equal("...judge Allen and...", excerpt("This day was challenging for judge Allen and his colleagues.", /\ballen\b/i, :radius => 1, :separator => " "))
-    assert_equal("...was challenging for...", excerpt("This day was challenging for judge Allen and his colleagues.", /\b(\w*allen\w*)\b/i, :radius => 5))
+    assert_equal("...is a beautiful! mor...", excerpt("This is a beautiful! morning", "beautiful", radius: 5))
+    assert_equal("...is a beautiful? mor...", excerpt("This is a beautiful? morning", "beautiful", radius: 5))
+    assert_equal("...is a beautiful? mor...", excerpt("This is a beautiful? morning", /\bbeau\w*\b/i, radius: 5))
+    assert_equal("...is a beautiful? mor...", excerpt("This is a beautiful? morning", /\b(beau\w*)\b/i, radius: 5))
+    assert_equal("...udge Allen and...", excerpt("This day was challenging for judge Allen and his colleagues.", /\ballen\b/i, radius: 5))
+    assert_equal("...judge Allen and...", excerpt("This day was challenging for judge Allen and his colleagues.", /\ballen\b/i, radius: 1, separator: " "))
+    assert_equal("...was challenging for...", excerpt("This day was challenging for judge Allen and his colleagues.", /\b(\w*allen\w*)\b/i, radius: 5))
   end
 
   def test_excerpt_should_not_be_html_safe
-    assert !excerpt("This is a beautiful! morning", "beautiful", :radius => 5).html_safe?
+    assert !excerpt("This is a beautiful! morning", "beautiful", radius: 5).html_safe?
   end
 
   def test_excerpt_in_borderline_cases
-    assert_equal("", excerpt("", "", :radius => 0))
-    assert_equal("a", excerpt("a", "a", :radius => 0))
-    assert_equal("...b...", excerpt("abc", "b", :radius => 0))
-    assert_equal("abc", excerpt("abc", "b", :radius => 1))
-    assert_equal("abc...", excerpt("abcd", "b", :radius => 1))
-    assert_equal("...abc", excerpt("zabc", "b", :radius => 1))
-    assert_equal("...abc...", excerpt("zabcd", "b", :radius => 1))
-    assert_equal("zabcd", excerpt("zabcd", "b", :radius => 2))
+    assert_equal("", excerpt("", "", radius: 0))
+    assert_equal("a", excerpt("a", "a", radius: 0))
+    assert_equal("...b...", excerpt("abc", "b", radius: 0))
+    assert_equal("abc", excerpt("abc", "b", radius: 1))
+    assert_equal("abc...", excerpt("abcd", "b", radius: 1))
+    assert_equal("...abc", excerpt("zabc", "b", radius: 1))
+    assert_equal("...abc...", excerpt("zabcd", "b", radius: 1))
+    assert_equal("zabcd", excerpt("zabcd", "b", radius: 2))
 
     # excerpt strips the resulting string before ap-/prepending excerpt_string.
     # whether this behavior is meaningful when excerpt_string is not to be
     # appended is questionable.
-    assert_equal("zabcd", excerpt("  zabcd  ", "b", :radius => 4))
-    assert_equal("...abc...", excerpt("z  abc  d", "b", :radius => 1))
+    assert_equal("zabcd", excerpt("  zabcd  ", "b", radius: 4))
+    assert_equal("...abc...", excerpt("z  abc  d", "b", radius: 1))
   end
 
   def test_excerpt_with_omission
-    assert_equal("[...]is a beautiful morn[...]", excerpt("This is a beautiful morning", "beautiful", :omission => "[...]",:radius => 5))
+    assert_equal("[...]is a beautiful morn[...]", excerpt("This is a beautiful morning", "beautiful", omission: "[...]",radius: 5))
     assert_equal(
       "This is the ultimate supercalifragilisticexpialidoceous very looooooooooooooooooong looooooooooooong beautiful morning with amazing sunshine and awesome tempera[...]",
       excerpt("This is the ultimate supercalifragilisticexpialidoceous very looooooooooooooooooong looooooooooooong beautiful morning with amazing sunshine and awesome temperatures. So what are you gonna do about it?", "very",
-      :omission => "[...]")
+      omission: "[...]")
     )
   end
 
   def test_excerpt_with_utf8
-    assert_equal("...\357\254\203ciency could not be...".force_encoding(Encoding::UTF_8), excerpt("That's why e\357\254\203ciency could not be helped".force_encoding(Encoding::UTF_8), "could", :radius => 8))
+    assert_equal("...\357\254\203ciency could not be...".force_encoding(Encoding::UTF_8), excerpt("That's why e\357\254\203ciency could not be helped".force_encoding(Encoding::UTF_8), "could", radius: 8))
   end
 
   def test_excerpt_does_not_modify_the_options_hash
-    options = { :omission => "[...]",:radius => 5 }
+    options = { omission: "[...]",radius: 5 }
     passed_options = options.dup
     excerpt("This is a beautiful morning", "beautiful", passed_options)
     assert_equal options, passed_options
   end
 
   def test_excerpt_with_separator
-    options = { :separator => " ", :radius => 1 }
+    options = { separator: " ", radius: 1 }
     assert_equal("...a very beautiful...", excerpt("This is a very beautiful morning", "very", options))
     assert_equal("This is...", excerpt("This is a very beautiful morning", "this", options))
     assert_equal("...beautiful morning", excerpt("This is a very beautiful morning", "morning", options))
 
-    options = { :separator => "\n", :radius => 0 }
+    options = { separator: "\n", radius: 0 }
     assert_equal("...very long...", excerpt("my very\nvery\nvery long\nstring", "long", options))
 
-    options = { :separator => "\n", :radius => 1 }
+    options = { separator: "\n", radius: 1 }
     assert_equal("...very\nvery long\nstring", excerpt("my very\nvery\nvery long\nstring", "long", options))
 
     assert_equal excerpt("This is a beautiful morning", "a"),
@@ -352,15 +352,15 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_word_wrap
-    assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", :line_width => 15))
+    assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", line_width: 15))
   end
 
   def test_word_wrap_with_extra_newlines
-    assert_equal("my very very\nvery long\nstring\n\nwith another\nline", word_wrap("my very very very long string\n\nwith another line", :line_width => 15))
+    assert_equal("my very very\nvery long\nstring\n\nwith another\nline", word_wrap("my very very very long string\n\nwith another line", line_width: 15))
   end
 
   def test_word_wrap_does_not_modify_the_options_hash
-    options = { :line_width => 15 }
+    options = { line_width: 15 }
     passed_options = options.dup
     word_wrap("some text", passed_options)
     assert_equal options, passed_options
@@ -458,12 +458,12 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_named_cycles
-    assert_equal("1", cycle(1, 2, 3, :name => "numbers"))
-    assert_equal("red", cycle("red", "blue", :name => "colors"))
-    assert_equal("2", cycle(1, 2, 3, :name => "numbers"))
-    assert_equal("blue", cycle("red", "blue", :name => "colors"))
-    assert_equal("3", cycle(1, 2, 3, :name => "numbers"))
-    assert_equal("red", cycle("red", "blue", :name => "colors"))
+    assert_equal("1", cycle(1, 2, 3, name: "numbers"))
+    assert_equal("red", cycle("red", "blue", name: "colors"))
+    assert_equal("2", cycle(1, 2, 3, name: "numbers"))
+    assert_equal("blue", cycle("red", "blue", name: "colors"))
+    assert_equal("3", cycle(1, 2, 3, name: "numbers"))
+    assert_equal("red", cycle("red", "blue", name: "colors"))
   end
 
   def test_current_cycle_with_default_name
@@ -476,11 +476,11 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_current_cycle_with_named_cycles
-    cycle("red", "blue", :name => "colors")
+    cycle("red", "blue", name: "colors")
     assert_equal "red", current_cycle("colors")
-    cycle("red", "blue", :name => "colors")
+    cycle("red", "blue", name: "colors")
     assert_equal "blue", current_cycle("colors")
-    cycle("red", "blue", :name => "colors")
+    cycle("red", "blue", name: "colors")
     assert_equal "red", current_cycle("colors")
   end
 
@@ -502,7 +502,7 @@ class TextHelperTest < ActionView::TestCase
 
   def test_default_named_cycle
     assert_equal("1", cycle(1, 2, 3))
-    assert_equal("2", cycle(1, 2, 3, :name => "default"))
+    assert_equal("2", cycle(1, 2, 3, name: "default"))
     assert_equal("3", cycle(1, 2, 3))
   end
 
@@ -518,13 +518,13 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_reset_named_cycle
-    assert_equal("1", cycle(1, 2, 3, :name => "numbers"))
-    assert_equal("red", cycle("red", "blue", :name => "colors"))
+    assert_equal("1", cycle(1, 2, 3, name: "numbers"))
+    assert_equal("red", cycle("red", "blue", name: "colors"))
     reset_cycle("numbers")
-    assert_equal("1", cycle(1, 2, 3, :name => "numbers"))
-    assert_equal("blue", cycle("red", "blue", :name => "colors"))
-    assert_equal("2", cycle(1, 2, 3, :name => "numbers"))
-    assert_equal("red", cycle("red", "blue", :name => "colors"))
+    assert_equal("1", cycle(1, 2, 3, name: "numbers"))
+    assert_equal("blue", cycle("red", "blue", name: "colors"))
+    assert_equal("2", cycle(1, 2, 3, name: "numbers"))
+    assert_equal("red", cycle("red", "blue", name: "colors"))
   end
 
   def test_cycle_no_instance_variable_clashes
-- 
cgit v1.2.3