Allow GET as well as POST for oauth#request_token and oauth#access_token

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

diff --git a/test/functional/message_controller_test.rb b/test/functional/message_controller_test.rb
index 45190b714c29b0a34028a3eb42c3bc8a8d4380a2..f015b1ec33e6467909105150843c46b536128855 100644 (file)
--- a/test/functional/message_controller_test.rb
+++ b/test/functional/message_controller_test.rb
@@ -85,7 +85,7 @@ class MessageControllerTest < ActionController::TestCase
     m = Message.find(3)
     assert_equal users(:normal_user).id, m.from_user_id
     assert_equal users(:public_user).id, m.to_user_id
-    assert_in_delta Time.now, m.sent_on, 1
+    assert_in_delta Time.now, m.sent_on, 2
     assert_equal "Test Message", m.title
     assert_equal "Test message body", m.body
     assert_equal "markdown", m.body_format
@@ -130,7 +130,7 @@ class MessageControllerTest < ActionController::TestCase
     assert_equal true, Message.find(messages(:unread_message).id).message_read
 
     # Asking to reply to a message with no ID should fail
-    assert_raise ActionController::RoutingError do
+    assert_raise ActionController::UrlGenerationError do
       get :reply
     end
 
@@ -177,7 +177,7 @@ class MessageControllerTest < ActionController::TestCase
     assert_equal true, Message.find(messages(:unread_message).id).message_read
 
     # Asking to read a message with no ID should fail
-    assert_raise ActionController::RoutingError do
+    assert_raise ActionController::UrlGenerationError do
       get :read
     end
 
@@ -280,7 +280,7 @@ class MessageControllerTest < ActionController::TestCase
     assert_equal false, Message.find(messages(:unread_message).id).message_read
 
     # Asking to mark a message with no ID should fail
-    assert_raise ActionController::RoutingError do
+    assert_raise ActionController::UrlGenerationError do
       post :mark
     end
 
@@ -327,7 +327,7 @@ class MessageControllerTest < ActionController::TestCase
     assert_equal true, m.to_user_visible
 
     # Asking to delete a message with no ID should fail
-    assert_raise ActionController::RoutingError do
+    assert_raise ActionController::UrlGenerationError do
       post :delete
     end