Remove deprecated assert_blank and assert_present from tests

[rails.git] / test / functional / diary_entry_controller_test.rb

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 5d0cb93acfe3df6bf4bfbb0f0f504f52fb3c8738..06c31574daff72705ff078799fd7c39ea7ccd7df 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -31,15 +31,15 @@ class DiaryEntryControllerTest < ActionController::TestCase
 
     assert_routing(
       { :path => "/diary/rss", :method => :get },
-      { :controller => "diary_entry", :action => "rss", :format => :rss }
+      { :controller => "diary_entry", :action => "rss" }
     )
     assert_routing(
       { :path => "/diary/language/rss", :method => :get },
-      { :controller => "diary_entry", :action => "rss", :language => "language", :format => :rss }
+      { :controller => "diary_entry", :action => "rss", :language => "language" }
     )
     assert_routing(
       { :path => "/user/username/diary/rss", :method => :get },
-      { :controller => "diary_entry", :action => "rss", :display_name => "username", :format => :rss }
+      { :controller => "diary_entry", :action => "rss", :display_name => "username" }
     )
 
     assert_routing(
@@ -201,7 +201,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       assert_select "body", :count => 1 do
         assert_select "div.wrapper", :count => 1 do
           assert_select "div.content-heading", :count => 1 do
-            assert_select "h2", :text => /#{entry.user.display_name}&#x27;s diary/, :count => 1
+            assert_select "h2", :text => /#{entry.user.display_name}&#39;s diary/, :count => 1
           end
           assert_select "div#content", :count => 1 do
             assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
@@ -230,7 +230,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       assert_select "body", :count => 1 do
         assert_select "div.wrapper", :count => 1 do
           assert_select "div.content-heading", :count => 1 do
-            assert_select "h2", :text => /#{users(:normal_user).display_name}&#x27;s diary/, :count => 1
+            assert_select "h2", :text => /#{users(:normal_user).display_name}&#39;s diary/, :count => 1
           end
           assert_select "div#content", :count => 1 do
             assert_select "div.post_heading", :text => /#{new_title}/, :count => 1