Improve consistency of text validations

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

diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb
index edff9062560cb34d596a02b6e44957404c264f94..cec2250476fe17e8c89668f79f90314544261032 100644 (file)
--- a/test/controllers/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -104,7 +104,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # are not logged in
     get :new
     assert_response :redirect
     # are not logged in
     get :new
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/new"
+    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/new"

   end
 
   def test_new_form
   end
 
   def test_new_form


@@ -240,7 +240,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
         :params => { :display_name => user.display_name },
         :session => { :user => user }
     assert_response :redirect
         :params => { :display_name => user.display_name },
         :session => { :user => user }
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :suspended
+    assert_redirected_to :controller => :users, :action => :suspended

   end
 
   def test_edit
   end
 
   def test_edit


@@ -254,7 +254,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     get :edit,
         :params => { :display_name => entry.user.display_name, :id => entry.id }
     assert_response :redirect
     get :edit,
         :params => { :display_name => entry.user.display_name, :id => entry.id }
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit"
+    assert_redirected_to :controller => :users, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit"

 
     # Verify that you get a not found error, when you pass a bogus id
     get :edit,
 
     # Verify that you get a not found error, when you pass a bogus id
     get :edit,


@@ -390,9 +390,11 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       assert_no_difference "DiaryComment.count" do
         assert_no_difference "entry.subscribers.count" do
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       assert_no_difference "DiaryComment.count" do
         assert_no_difference "entry.subscribers.count" do

-          post :comment,
-               :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } },
-               :session => { :user => other_user }
+          perform_enqueued_jobs do
+            post :comment,
+                 :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } },
+                 :session => { :user => other_user }
+          end

         end
       end
     end
         end
       end
     end


@@ -403,9 +405,11 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do
       assert_difference "DiaryComment.count", 1 do
         assert_difference "entry.subscribers.count", 1 do
     assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do
       assert_difference "DiaryComment.count", 1 do
         assert_difference "entry.subscribers.count", 1 do

-          post :comment,
-               :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } },
-               :session => { :user => other_user }
+          perform_enqueued_jobs do
+            post :comment,
+                 :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } },
+                 :session => { :user => other_user }
+          end

         end
       end
     end
         end
       end
     end


@@ -450,9 +454,11 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Try creating a spammy comment
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "DiaryComment.count", 1 do
     # Try creating a spammy comment
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "DiaryComment.count", 1 do

-        post :comment,
-             :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => spammy_text } },
-             :session => { :user => other_user }
+        perform_enqueued_jobs do
+          post :comment,
+               :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => spammy_text } },
+               :session => { :user => other_user }
+        end

       end
     end
     assert_response :redirect
       end
     end
     assert_response :redirect


@@ -474,7 +480,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
         :params => { :display_name => user.display_name },
         :session => { :user => other_user }
     assert_response :redirect
         :params => { :display_name => user.display_name },
         :session => { :user => other_user }
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :suspended
+    assert_redirected_to :controller => :users, :action => :suspended

 
     # Now show the diary entry, and check the new comment is not present
     get :show,
 
     # Now show the diary entry, and check the new comment is not present
     get :show,


@@ -508,7 +514,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Try a list of diary entries for an invalid user
     get :index, :params => { :display_name => "No Such User" }
     assert_response :not_found
     # Try a list of diary entries for an invalid user
     get :index, :params => { :display_name => "No Such User" }
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

   end
 
   def test_index_friends
   end
 
   def test_index_friends


@@ -521,7 +527,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Try a list of diary entries for your friends when not logged in
     get :index, :params => { :friends => true }
     assert_response :redirect
     # Try a list of diary entries for your friends when not logged in
     get :index, :params => { :friends => true }
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/friends"
+    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/friends"

 
     # Try a list of diary entries for your friends when logged in
     get :index, :params => { :friends => true }, :session => { :user => user }
 
     # Try a list of diary entries for your friends when logged in
     get :index, :params => { :friends => true }, :session => { :user => user }


@@ -539,7 +545,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Try a list of diary entries for nearby users when not logged in
     get :index, :params => { :nearby => true }
     assert_response :redirect
     # Try a list of diary entries for nearby users when not logged in
     get :index, :params => { :nearby => true }
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/nearby"
+    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/nearby"

 
     # Try a list of diary entries for nearby users when logged in
     get :index, :params => { :nearby => true }, :session => { :user => nearby_user }
 
     # Try a list of diary entries for nearby users when logged in
     get :index, :params => { :nearby => true }, :session => { :user => nearby_user }