Merge pull request #4062 from stalker314314/fix-erb-lint-copyright

[rails.git] / test / helpers / application_helper_test.rb

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 90fbaebc29b926a1a666baa6a3b05cdba71d8e35..06c1c09f85133fb359e007de5ff5c38902188d8d 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -3,24 +3,16 @@ require "test_helper"
 class ApplicationHelperTest < ActionView::TestCase
   attr_accessor :current_user
 
-  def setup
-    I18n.locale = "en"
-  end
-
-  def teardown
-    I18n.locale = "en"
-  end
-
   def test_linkify
     %w[http://example.com/test ftp://example.com/test https://example.com/test].each do |link|
       text = "Test #{link} is <b>made</b> into a link"
 
       html = linkify(text)
-      assert html.html_safe?
+      assert_predicate html, :html_safe?
       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is &lt;b&gt;made&lt;/b&gt; into a link", html
 
       html = linkify(text.html_safe)
-      assert html.html_safe?
+      assert_predicate html, :html_safe?
       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is <b>made</b> into a link", html
     end
 
@@ -28,11 +20,11 @@ class ApplicationHelperTest < ActionView::TestCase
       text = "Test #{link} is not <b>made</b> into a link"
 
       html = linkify(text)
-      assert html.html_safe?
+      assert_predicate html, :html_safe?
       assert_dom_equal "Test #{link} is not &lt;b&gt;made&lt;/b&gt; into a link", html
 
       html = linkify(text.html_safe)
-      assert html.html_safe?
+      assert_predicate html, :html_safe?
       assert_dom_equal "Test #{link} is not <b>made</b> into a link", html
     end
   end
@@ -54,29 +46,29 @@ class ApplicationHelperTest < ActionView::TestCase
     assert_equal "rtl", dir
     params.delete(:dir)
 
-    I18n.locale = "he"
+    I18n.with_locale "he" do
+      assert_equal "rtl", dir
 
-    assert_equal "rtl", dir
-
-    params[:dir] = "ltr"
-    assert_equal "ltr", dir
-    params.delete(:dir)
+      params[:dir] = "ltr"
+      assert_equal "ltr", dir
+      params.delete(:dir)
+    end
   end
 
   def test_friendly_date
-    date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23))
+    date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23).utc)
     assert_match %r{^<span title=" *5 March 2014 at 18:58">.*</span>$}, date
 
-    date = friendly_date(Time.now - 1.hour)
+    date = friendly_date(Time.now.utc - 1.hour)
     assert_match %r{^<span title=".*">about 1 hour</span>$}, date
 
-    date = friendly_date(Time.now - 2.days)
+    date = friendly_date(Time.now.utc - 2.days)
     assert_match %r{^<span title=".*">2 days</span>$}, date
 
-    date = friendly_date(Time.now - 3.weeks)
+    date = friendly_date(Time.now.utc - 3.weeks)
     assert_match %r{^<span title=".*">21 days</span>$}, date
 
-    date = friendly_date(Time.now - 4.months)
+    date = friendly_date(Time.now.utc - 4.months)
     assert_match %r{^<span title=".*">4 months</span>$}, date
   end