X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/497009ed2b98dfdeeb349e891c1fbd88d14ff087..9ef85e42ba4a3b10157b2aa0711e68acaf9e3f9e:/test/helpers/application_helper_test.rb diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 5604b09bf..97b35467b 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require "test_helper" class ApplicationHelperTest < ActionView::TestCase fixtures :users, :user_roles @@ -7,7 +7,7 @@ class ApplicationHelperTest < ActionView::TestCase I18n.locale = "en" end - def setup + def teardown I18n.locale = "en" end @@ -20,7 +20,7 @@ class ApplicationHelperTest < ActionView::TestCase assert_dom_equal "Test #{link} is made into a link", html html = linkify(text.html_safe) - assert_equal true, html.html_safe? + assert_equal true, html.html_safe? assert_dom_equal "Test #{link} is made into a link", html end @@ -32,7 +32,7 @@ class ApplicationHelperTest < ActionView::TestCase assert_dom_equal text, html html = linkify(text.html_safe) - assert_equal true, html.html_safe? + assert_equal true, html.html_safe? assert_dom_equal text, html end end @@ -168,19 +168,19 @@ class ApplicationHelperTest < ActionView::TestCase def test_friendly_date date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23)) - assert_match /^.*<\/span>$/, date + assert_match %r{^.*$}, date date = friendly_date(Time.now - 1.hour) - assert_match /^about 1 hour<\/span>$/, date + assert_match %r{^about 1 hour$}, date date = friendly_date(Time.now - 2.days) - assert_match /^2 days<\/span>$/, date + assert_match %r{^2 days$}, date date = friendly_date(Time.now - 3.weeks) - assert_match /^21 days<\/span>$/, date + assert_match %r{^21 days$}, date date = friendly_date(Time.now - 4.months) - assert_match /^4 months<\/span>$/, date + assert_match %r{^4 months$}, date end def test_body_class