X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/94a48482e0bef11bdaf11f0200b4296ee8fabf23..bc71737f052473615935f5f169a3b8e4fba229a6:/test/helpers/application_helper_test.rb?ds=sidebyside diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 16b1040e5..7cd6bce89 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -3,37 +3,29 @@ 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 made into a link" + text = "Test #{link} is made into a link" html = linkify(text) - assert_equal false, html.html_safe? - assert_dom_equal "Test #{link} is made into a link", html + assert_predicate html, :html_safe? + assert_dom_equal "Test #{link} is <b>made</b> into a link", html html = linkify(text.html_safe) - assert_equal true, html.html_safe? - assert_dom_equal "Test #{link} is made into a link", html + assert_predicate html, :html_safe? + assert_dom_equal "Test #{link} is made into a link", html end %w[test@example.com mailto:test@example.com].each do |link| - text = "Test #{link} is not made into a link" + text = "Test #{link} is not made into a link" html = linkify(text) - assert_equal false, html.html_safe? - assert_dom_equal text, html + 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_equal true, html.html_safe? - assert_dom_equal text, html + assert_predicate html, :html_safe? + assert_dom_equal "Test #{link} is not made into a link", html end end @@ -47,11 +39,6 @@ class ApplicationHelperTest < ActionView::TestCase assert_dom_equal "", link end - def test_richtext_area - html = richtext_area(:message, :body, :cols => 40, :rows => 20) - assert_not_nil html - end - def test_dir assert_equal "ltr", dir @@ -59,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.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