Merge remote-tracking branch 'upstream/pull/5150'

[rails.git] / test / helpers / application_helper_test.rb

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 43e27c5295bc1cf4adbd01414b1b5e8e2e7deaea..24d74c85f3b0ad5d1a06aaad93f8eaf6f4739e2d 100644 (file)
--- 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 <b>made</b> into a link"
 
       html = linkify(text)
       text = "Test #{link} is <b>made</b> into a link"
 
       html = linkify(text)

-      assert html.html_safe?
+      assert_predicate html, :html_safe?

       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is &lt;b&gt;made&lt;/b&gt; into a link", html
 
       html = linkify(text.html_safe)
       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is &lt;b&gt;made&lt;/b&gt; into a link", html
 
       html = linkify(text.html_safe)

-      assert html.html_safe?
+      assert_predicate html, :html_safe?

       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is <b>made</b> into a link", html
     end
 
       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is <b>made</b> into a link", html
     end
 


@@ -20,23 +20,23 @@ class ApplicationHelperTest < ActionView::TestCase
       text = "Test #{link} is not <b>made</b> into a link"
 
       html = linkify(text)
       text = "Test #{link} is not <b>made</b> into a link"
 
       html = linkify(text)

-      assert html.html_safe?
+      assert_predicate html, :html_safe?

       assert_dom_equal "Test #{link} is not &lt;b&gt;made&lt;/b&gt; into a link", html
 
       html = linkify(text.html_safe)
       assert_dom_equal "Test #{link} is not &lt;b&gt;made&lt;/b&gt; 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 <b>made</b> into a link", html
     end
   end
 
   def test_rss_link_to
     link = rss_link_to(:controller => :diary_entries, :action => :rss)
       assert_dom_equal "Test #{link} is not <b>made</b> into a link", html
     end
   end
 
   def test_rss_link_to
     link = rss_link_to(:controller => :diary_entries, :action => :rss)

-    assert_dom_equal "<a class=\"rsssmall\" href=\"/diary/rss\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
+    assert_dom_equal "<a href=\"/diary/rss\"><img height=\"16\" src=\"/images/RSS.png\" width=\"16\" class=\"align-text-bottom\" /></a>", link

   end
 
   def test_atom_link_to
     link = atom_link_to(:controller => :changesets, :action => :feed)
   end
 
   def test_atom_link_to
     link = atom_link_to(:controller => :changesets, :action => :feed)

-    assert_dom_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
+    assert_dom_equal "<a href=\"/history/feed\"><img height=\"16\" src=\"/images/RSS.png\" width=\"16\" class=\"align-text-bottom\" /></a>", link

   end
 
   def test_dir
   end
 
   def test_dir


@@ -56,23 +56,40 @@ class ApplicationHelperTest < ActionView::TestCase
   end
 
   def test_friendly_date
   end
 
   def test_friendly_date

-    date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23))
-    assert_match %r{^<span title=" *5 March 2014 at 18:58">.*</span>$}, date
+    date = friendly_date(Time.utc(2014, 3, 5, 18, 58, 23))
+    assert_match %r{^<time title=" *5 March 2014 at 18:58" datetime="2014-03-05T18:58:23Z">.*</time>$}, date

 
 

-    date = friendly_date(Time.now - 1.hour)
-    assert_match %r{^<span title=".*">about 1 hour</span>$}, date
+    date = friendly_date(Time.now.utc - 1.hour)
+    assert_match %r{^<time title=".*">about 1 hour</time>$}, date

 
 

-    date = friendly_date(Time.now - 2.days)
-    assert_match %r{^<span title=".*">2 days</span>$}, date
+    date = friendly_date(Time.now.utc - 2.days)
+    assert_match %r{^<time title=".*">2 days</time>$}, date

 
 

-    date = friendly_date(Time.now - 3.weeks)
-    assert_match %r{^<span title=".*">21 days</span>$}, date
+    date = friendly_date(Time.now.utc - 3.weeks)
+    assert_match %r{^<time title=".*">21 days</time>$}, date

 
 

-    date = friendly_date(Time.now - 4.months)
-    assert_match %r{^<span title=".*">4 months</span>$}, date
+    date = friendly_date(Time.now.utc - 4.months)
+    assert_match %r{^<time title=".*">4 months</time>$}, date
+  end
+
+  def test_friendly_date_ago
+    date = friendly_date_ago(Time.utc(2014, 3, 5, 18, 58, 23))
+    assert_match %r{^<time title=" *5 March 2014 at 18:58" datetime="2014-03-05T18:58:23Z">.*</time>$}, date
+
+    date = friendly_date_ago(Time.now.utc - 1.hour)
+    assert_match %r{^<time title=".*">about 1 hour ago</time>$}, date
+
+    date = friendly_date_ago(Time.now.utc - 2.days)
+    assert_match %r{^<time title=".*">2 days ago</time>$}, date
+
+    date = friendly_date_ago(Time.now.utc - 3.weeks)
+    assert_match %r{^<time title=".*">21 days ago</time>$}, date
+
+    date = friendly_date_ago(Time.now.utc - 4.months)
+    assert_match %r{^<time title=".*">4 months ago</time>$}, date

   end
 
   def test_body_class; end
 
   end
 
   def test_body_class; end
 

-  def test_current_page_class; end
+  def test_header_nav_link_class; end

 end
 end