X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63e4a89323f4b0dba5e64b227f3e8508c94373b6..c23d8bfa6ac9c344b0875449109ab52caa84aa12:/test/helpers/application_helper_test.rb
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 43e27c529..7cd6bce89 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -8,11 +8,11 @@ class ApplicationHelperTest < ActionView::TestCase
text = "Test #{link} is made into a link"
html = linkify(text)
- assert html.html_safe?
+ assert_predicate html, :html_safe?
assert_dom_equal "Test #{link} is <b>made</b> into a link", html
html = linkify(text.html_safe)
- assert html.html_safe?
+ assert_predicate html, :html_safe?
assert_dom_equal "Test #{link} is made into a link", html
end
@@ -20,11 +20,11 @@ class ApplicationHelperTest < ActionView::TestCase
text = "Test #{link} is not made into a link"
html = linkify(text)
- assert html.html_safe?
+ assert_predicate html, :html_safe?
assert_dom_equal "Test #{link} is not <b>made</b> 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 made into a link", html
end
end
@@ -56,19 +56,19 @@ class ApplicationHelperTest < ActionView::TestCase
end
def test_friendly_date
- date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23))
+ date = friendly_date(Time.utc(2014, 3, 5, 18, 58, 23))
assert_match %r{^.*$}, date
- date = friendly_date(Time.now - 1.hour)
+ date = friendly_date(Time.now.utc - 1.hour)
assert_match %r{^about 1 hour$}, date
- date = friendly_date(Time.now - 2.days)
+ date = friendly_date(Time.now.utc - 2.days)
assert_match %r{^2 days$}, date
- date = friendly_date(Time.now - 3.weeks)
+ date = friendly_date(Time.now.utc - 3.weeks)
assert_match %r{^21 days$}, date
- date = friendly_date(Time.now - 4.months)
+ date = friendly_date(Time.now.utc - 4.months)
assert_match %r{^4 months$}, date
end