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

[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 89e5a38937c221bc32db5d2710b18bfe65d6185e..16b1040e522e99eebe659033f3ed10db6e093f1c 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -38,12 +38,12 @@ class ApplicationHelperTest < ActionView::TestCase
   end
 
   def test_rss_link_to
   end
 
   def test_rss_link_to

-    link = rss_link_to(:controller => :diary_entry, :action => :rss)
+    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
   end
 
   def test_atom_link_to
     assert_dom_equal "<a class=\"rsssmall\" href=\"/diary/rss\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
   end
 
   def test_atom_link_to

-    link = atom_link_to(:controller => :changeset, :action => :feed)
+    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
   end
 
     assert_dom_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
   end