X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..507c395f51c20c3c0d5375313ea1ca0ed4156c75:/test/helpers/application_helper_test.rb diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 90fbaebc2..524851e63 100644 --- 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 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 @@ -28,23 +20,23 @@ 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 def test_rss_link_to link = rss_link_to(:controller => :diary_entries, :action => :rss) - assert_dom_equal "", link + assert_dom_equal "", link end def test_atom_link_to link = atom_link_to(:controller => :changesets, :action => :feed) - assert_dom_equal "", link + assert_dom_equal "", link end def test_dir @@ -54,33 +46,46 @@ 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)) - assert_match %r{^.*$}, date + date = friendly_date(Time.utc(2014, 3, 5, 18, 58, 23)) + assert_match %r{^$}, date - date = friendly_date(Time.now - 1.hour) - assert_match %r{^about 1 hour$}, date + date = friendly_date(Time.now.utc - 1.hour) + assert_match %r{^$}, date - date = friendly_date(Time.now - 2.days) - assert_match %r{^2 days$}, date + date = friendly_date(Time.now.utc - 2.days) + assert_match %r{^$}, date - date = friendly_date(Time.now - 3.weeks) - assert_match %r{^21 days$}, date + date = friendly_date(Time.now.utc - 3.weeks) + assert_match %r{^$}, date - date = friendly_date(Time.now - 4.months) - assert_match %r{^4 months$}, date + date = friendly_date(Time.now.utc - 4.months) + assert_match %r{^$}, date end - def test_body_class; end + def test_friendly_date_ago + date = friendly_date_ago(Time.utc(2014, 3, 5, 18, 58, 23)) + assert_match %r{^$}, date + + date = friendly_date_ago(Time.now.utc - 1.hour) + assert_match %r{^$}, date - def test_current_page_class; end + date = friendly_date_ago(Time.now.utc - 2.days) + assert_match %r{^$}, date + + date = friendly_date_ago(Time.now.utc - 3.weeks) + assert_match %r{^$}, date + + date = friendly_date_ago(Time.now.utc - 4.months) + assert_match %r{^$}, date + end end