X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b5f06e06c14f440d3c014b348149fe9ec1b67657..ddc252016a42c076c4f8dd8d0efd1caf055eb518:/test/helpers/application_helper_test.rb diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index d3e4d4f07..24d74c85f 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,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 @@ -56,23 +56,40 @@ class ApplicationHelperTest < ActionView::TestCase end def test_friendly_date - date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23).utc) - assert_match %r{^.*$}, date + date = friendly_date(Time.utc(2014, 3, 5, 18, 58, 23)) + assert_match %r{^$}, date date = friendly_date(Time.now.utc - 1.hour) - assert_match %r{^about 1 hour$}, date + assert_match %r{^$}, date date = friendly_date(Time.now.utc - 2.days) - assert_match %r{^2 days$}, date + assert_match %r{^$}, date date = friendly_date(Time.now.utc - 3.weeks) - assert_match %r{^21 days$}, date + assert_match %r{^$}, date date = friendly_date(Time.now.utc - 4.months) - assert_match %r{^4 months$}, date + assert_match %r{^$}, date + 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 + + 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 def test_body_class; end - def test_current_page_class; end + def test_header_nav_link_class; end end