Merge branch 'master' into moderation

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

diff --git a/test/controllers/message_controller_test.rb b/test/controllers/message_controller_test.rb
index ae71046c16226276614731052b89cf55b609be59..8a7ae70de6c34a96f1a92194839819f56a5ccc95 100644 (file)
--- a/test/controllers/message_controller_test.rb
+++ b/test/controllers/message_controller_test.rb
@@ -47,7 +47,7 @@ class MessageControllerTest < ActionController::TestCase
   def test_new_no_login
     # Check that the new message page requires us to login
     user = create(:user)
   def test_new_no_login
     # Check that the new message page requires us to login
     user = create(:user)

-    get :new, :display_name => user.display_name
+    get :new, :params => { :display_name => user.display_name }

     assert_redirected_to login_path(:referer => new_message_path(:display_name => user.display_name))
   end
 
     assert_redirected_to login_path(:referer => new_message_path(:display_name => user.display_name))
   end
 


@@ -60,7 +60,7 @@ class MessageControllerTest < ActionController::TestCase
     session[:user] = user.id
 
     # Check that the new message page loads
     session[:user] = user.id
 
     # Check that the new message page loads

-    get :new, :display_name => recipient_user.display_name
+    get :new, :params => { :display_name => recipient_user.display_name }

     assert_response :success
     assert_template "new"
     assert_select "title", "OpenStreetMap | Send message"
     assert_response :success
     assert_template "new"
     assert_select "title", "OpenStreetMap | Send message"


@@ -83,8 +83,8 @@ class MessageControllerTest < ActionController::TestCase
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         get :new,
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         get :new,

-            :display_name => recipient_user.display_name,
-            :message => { :title => "Test Message", :body => "Test message body" }
+            :params => { :display_name => recipient_user.display_name,
+                         :message => { :title => "Test Message", :body => "Test message body" } }

       end
     end
     assert_response :success
       end
     end
     assert_response :success


@@ -111,8 +111,8 @@ class MessageControllerTest < ActionController::TestCase
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         post :new,
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         post :new,

-             :display_name => recipient_user.display_name,
-             :message => { :title => "Test Message", :body => "" }
+             :params => { :display_name => recipient_user.display_name,
+                          :message => { :title => "Test Message", :body => "" } }

       end
     end
     assert_response :success
       end
     end
     assert_response :success


@@ -139,8 +139,8 @@ class MessageControllerTest < ActionController::TestCase
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         post :new,
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         post :new,

-             :display_name => recipient_user.display_name,
-             :message => { :title => "", :body => "Test message body" }
+             :params => { :display_name => recipient_user.display_name,
+                          :message => { :title => "", :body => "Test message body" } }

       end
     end
     assert_response :success
       end
     end
     assert_response :success


@@ -167,8 +167,8 @@ class MessageControllerTest < ActionController::TestCase
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "Message.count", 1 do
         post :new,
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "Message.count", 1 do
         post :new,

-             :display_name => recipient_user.display_name,
-             :message => { :title => "Test Message", :body => "Test message body" }
+             :params => { :display_name => recipient_user.display_name,
+                          :message => { :title => "Test Message", :body => "Test message body" } }

       end
     end
     assert_redirected_to inbox_path(:display_name => user.display_name)
       end
     end
     assert_redirected_to inbox_path(:display_name => user.display_name)


@@ -188,7 +188,7 @@ class MessageControllerTest < ActionController::TestCase
     assert_equal "markdown", m.body_format
 
     # Asking to send a message with a bogus user name should fail
     assert_equal "markdown", m.body_format
 
     # Asking to send a message with a bogus user name should fail

-    get :new, :display_name => "non_existent_user"
+    get :new, :params => { :display_name => "non_existent_user" }

     assert_response :not_found
     assert_template "user/no_such_user"
     assert_select "h1", "The user non_existent_user does not exist"
     assert_response :not_found
     assert_template "user/no_such_user"
     assert_select "h1", "The user non_existent_user does not exist"


@@ -207,8 +207,8 @@ class MessageControllerTest < ActionController::TestCase
       assert_no_difference "Message.count" do
         with_message_limit(0) do
           post :new,
       assert_no_difference "Message.count" do
         with_message_limit(0) do
           post :new,

-               :display_name => recipient_user.display_name,
-               :message => { :title => "Test Message", :body => "Test message body" }
+               :params => { :display_name => recipient_user.display_name,
+                            :message => { :title => "Test Message", :body => "Test message body" } }

           assert_response :success
           assert_template "new"
           assert_select ".error", /wait a while/
           assert_response :success
           assert_template "new"
           assert_select ".error", /wait a while/


@@ -226,14 +226,14 @@ class MessageControllerTest < ActionController::TestCase
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the message reply page requires us to login
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the message reply page requires us to login

-    get :reply, :message_id => unread_message.id
+    get :reply, :params => { :message_id => unread_message.id }

     assert_redirected_to login_path(:referer => reply_message_path(:message_id => unread_message.id))
 
     # Login as the wrong user
     session[:user] = other_user.id
 
     # Check that we can't reply to somebody else's message
     assert_redirected_to login_path(:referer => reply_message_path(:message_id => unread_message.id))
 
     # Login as the wrong user
     session[:user] = other_user.id
 
     # Check that we can't reply to somebody else's message

-    get :reply, :message_id => unread_message.id
+    get :reply, :params => { :message_id => unread_message.id }

     assert_redirected_to login_path(:referer => reply_message_path(:message_id => unread_message.id))
     assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply.", flash[:notice]
 
     assert_redirected_to login_path(:referer => reply_message_path(:message_id => unread_message.id))
     assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply.", flash[:notice]
 


@@ -241,7 +241,7 @@ class MessageControllerTest < ActionController::TestCase
     session[:user] = recipient_user.id
 
     # Check that the message reply page loads
     session[:user] = recipient_user.id
 
     # Check that the message reply page loads

-    get :reply, :message_id => unread_message.id
+    get :reply, :params => { :message_id => unread_message.id }

     assert_response :success
     assert_template "new"
     assert_select "title", "OpenStreetMap | Re: #{unread_message.title}"
     assert_response :success
     assert_template "new"
     assert_select "title", "OpenStreetMap | Re: #{unread_message.title}"


@@ -258,7 +258,7 @@ class MessageControllerTest < ActionController::TestCase
     end
 
     # Asking to reply to a message with a bogus ID should fail
     end
 
     # Asking to reply to a message with a bogus ID should fail

-    get :reply, :message_id => 99999
+    get :reply, :params => { :message_id => 99999 }

     assert_response :not_found
     assert_template "no_such_message"
   end
     assert_response :not_found
     assert_template "no_such_message"
   end


@@ -272,14 +272,14 @@ class MessageControllerTest < ActionController::TestCase
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the read message page requires us to login
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the read message page requires us to login

-    get :read, :message_id => unread_message.id
+    get :read, :params => { :message_id => unread_message.id }

     assert_redirected_to login_path(:referer => read_message_path(:message_id => unread_message.id))
 
     # Login as the wrong user
     session[:user] = other_user.id
 
     # Check that we can't read the message
     assert_redirected_to login_path(:referer => read_message_path(:message_id => unread_message.id))
 
     # Login as the wrong user
     session[:user] = other_user.id
 
     # Check that we can't read the message

-    get :read, :message_id => unread_message.id
+    get :read, :params => { :message_id => unread_message.id }

     assert_redirected_to login_path(:referer => read_message_path(:message_id => unread_message.id))
     assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it.", flash[:notice]
 
     assert_redirected_to login_path(:referer => read_message_path(:message_id => unread_message.id))
     assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it.", flash[:notice]
 


@@ -287,7 +287,7 @@ class MessageControllerTest < ActionController::TestCase
     session[:user] = user.id
 
     # Check that the message sender can read the message
     session[:user] = user.id
 
     # Check that the message sender can read the message

-    get :read, :message_id => unread_message.id
+    get :read, :params => { :message_id => unread_message.id }

     assert_response :success
     assert_template "read"
     assert_equal false, Message.find(unread_message.id).message_read
     assert_response :success
     assert_template "read"
     assert_equal false, Message.find(unread_message.id).message_read


@@ -296,7 +296,7 @@ class MessageControllerTest < ActionController::TestCase
     session[:user] = recipient_user.id
 
     # Check that the message recipient can read the message
     session[:user] = recipient_user.id
 
     # Check that the message recipient can read the message

-    get :read, :message_id => unread_message.id
+    get :read, :params => { :message_id => unread_message.id }

     assert_response :success
     assert_template "read"
     assert_equal true, Message.find(unread_message.id).message_read
     assert_response :success
     assert_template "read"
     assert_equal true, Message.find(unread_message.id).message_read


@@ -307,7 +307,7 @@ class MessageControllerTest < ActionController::TestCase
     end
 
     # Asking to read a message with a bogus ID should fail
     end
 
     # Asking to read a message with a bogus ID should fail

-    get :read, :message_id => 99999
+    get :read, :params => { :message_id => 99999 }

     assert_response :not_found
     assert_template "no_such_message"
   end
     assert_response :not_found
     assert_template "no_such_message"
   end


@@ -319,14 +319,14 @@ class MessageControllerTest < ActionController::TestCase
     other_user = create(:user)
     read_message = create(:message, :read, :recipient => user)
     # Check that the inbox page requires us to login
     other_user = create(:user)
     read_message = create(:message, :read, :recipient => user)
     # Check that the inbox page requires us to login

-    get :inbox, :display_name => user.display_name
+    get :inbox, :params => { :display_name => user.display_name }

     assert_redirected_to login_path(:referer => inbox_path(:display_name => user.display_name))
 
     # Login
     session[:user] = user.id
 
     # Check that we can view our inbox when logged in
     assert_redirected_to login_path(:referer => inbox_path(:display_name => user.display_name))
 
     # Login
     session[:user] = user.id
 
     # Check that we can view our inbox when logged in

-    get :inbox, :display_name => user.display_name
+    get :inbox, :params => { :display_name => user.display_name }

     assert_response :success
     assert_template "inbox"
     assert_select "table.messages", :count => 1 do
     assert_response :success
     assert_template "inbox"
     assert_select "table.messages", :count => 1 do


@@ -335,7 +335,7 @@ class MessageControllerTest < ActionController::TestCase
     end
 
     # Check that we can't view somebody else's inbox when logged in
     end
 
     # Check that we can't view somebody else's inbox when logged in

-    get :inbox, :display_name => other_user.display_name
+    get :inbox, :params => { :display_name => other_user.display_name }

     assert_redirected_to inbox_path(:display_name => user.display_name)
   end
 
     assert_redirected_to inbox_path(:display_name => user.display_name)
   end
 


@@ -347,14 +347,14 @@ class MessageControllerTest < ActionController::TestCase
     create(:message, :sender => user)
 
     # Check that the outbox page requires us to login
     create(:message, :sender => user)
 
     # Check that the outbox page requires us to login

-    get :outbox, :display_name => user.display_name
+    get :outbox, :params => { :display_name => user.display_name }

     assert_redirected_to login_path(:referer => outbox_path(:display_name => user.display_name))
 
     # Login
     session[:user] = user.id
 
     # Check that we can view our outbox when logged in
     assert_redirected_to login_path(:referer => outbox_path(:display_name => user.display_name))
 
     # Login
     session[:user] = user.id
 
     # Check that we can view our outbox when logged in

-    get :outbox, :display_name => user.display_name
+    get :outbox, :params => { :display_name => user.display_name }

     assert_response :success
     assert_template "outbox"
     assert_select "table.messages", :count => 1 do
     assert_response :success
     assert_template "outbox"
     assert_select "table.messages", :count => 1 do


@@ -363,7 +363,7 @@ class MessageControllerTest < ActionController::TestCase
     end
 
     # Check that we can't view somebody else's outbox when logged in
     end
 
     # Check that we can't view somebody else's outbox when logged in

-    get :outbox, :display_name => other_user.display_name
+    get :outbox, :params => { :display_name => other_user.display_name }

     assert_redirected_to outbox_path(:display_name => user.display_name)
   end
 
     assert_redirected_to outbox_path(:display_name => user.display_name)
   end
 


@@ -376,14 +376,14 @@ class MessageControllerTest < ActionController::TestCase
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the marking a message requires us to login
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the marking a message requires us to login

-    post :mark, :message_id => unread_message.id
+    post :mark, :params => { :message_id => unread_message.id }

     assert_response :forbidden
 
     # Login as a user with no messages
     session[:user] = other_user.id
 
     # Check that marking a message we didn't send or receive fails
     assert_response :forbidden
 
     # Login as a user with no messages
     session[:user] = other_user.id
 
     # Check that marking a message we didn't send or receive fails

-    post :mark, :message_id => unread_message.id
+    post :mark, :params => { :message_id => unread_message.id }

     assert_response :not_found
     assert_template "no_such_message"
 
     assert_response :not_found
     assert_template "no_such_message"
 


@@ -391,23 +391,23 @@ class MessageControllerTest < ActionController::TestCase
     session[:user] = recipient_user.id
 
     # Check that the marking a message read works
     session[:user] = recipient_user.id
 
     # Check that the marking a message read works

-    post :mark, :message_id => unread_message.id, :mark => "read"
+    post :mark, :params => { :message_id => unread_message.id, :mark => "read" }

     assert_redirected_to inbox_path(:display_name => recipient_user.display_name)
     assert_equal true, Message.find(unread_message.id).message_read
 
     # Check that the marking a message unread works
     assert_redirected_to inbox_path(:display_name => recipient_user.display_name)
     assert_equal true, Message.find(unread_message.id).message_read
 
     # Check that the marking a message unread works

-    post :mark, :message_id => unread_message.id, :mark => "unread"
+    post :mark, :params => { :message_id => unread_message.id, :mark => "unread" }

     assert_redirected_to inbox_path(:display_name => recipient_user.display_name)
     assert_equal false, Message.find(unread_message.id).message_read
 
     # Check that the marking a message read via XHR works
     assert_redirected_to inbox_path(:display_name => recipient_user.display_name)
     assert_equal false, Message.find(unread_message.id).message_read
 
     # Check that the marking a message read via XHR works

-    xhr :post, :mark, :message_id => unread_message.id, :mark => "read"
+    post :mark, :xhr => true, :params => { :message_id => unread_message.id, :mark => "read" }

     assert_response :success
     assert_template "mark"
     assert_equal true, Message.find(unread_message.id).message_read
 
     # Check that the marking a message unread via XHR works
     assert_response :success
     assert_template "mark"
     assert_equal true, Message.find(unread_message.id).message_read
 
     # Check that the marking a message unread via XHR works

-    xhr :post, :mark, :message_id => unread_message.id, :mark => "unread"
+    post :mark, :xhr => true, :params => { :message_id => unread_message.id, :mark => "unread" }

     assert_response :success
     assert_template "mark"
     assert_equal false, Message.find(unread_message.id).message_read
     assert_response :success
     assert_template "mark"
     assert_equal false, Message.find(unread_message.id).message_read


@@ -418,7 +418,7 @@ class MessageControllerTest < ActionController::TestCase
     end
 
     # Asking to mark a message with a bogus ID should fail
     end
 
     # Asking to mark a message with a bogus ID should fail

-    post :mark, :message_id => 99999
+    post :mark, :params => { :message_id => 99999 }

     assert_response :not_found
     assert_template "no_such_message"
   end
     assert_response :not_found
     assert_template "no_such_message"
   end


@@ -433,14 +433,14 @@ class MessageControllerTest < ActionController::TestCase
     sent_message = create(:message, :unread, :recipient => second_user, :sender => user)
 
     # Check that the deleting a message requires us to login
     sent_message = create(:message, :unread, :recipient => second_user, :sender => user)
 
     # Check that the deleting a message requires us to login

-    post :delete, :message_id => read_message.id
+    post :delete, :params => { :message_id => read_message.id }

     assert_response :forbidden
 
     # Login as a user with no messages
     session[:user] = other_user.id
 
     # Check that deleting a message we didn't send or receive fails
     assert_response :forbidden
 
     # Login as a user with no messages
     session[:user] = other_user.id
 
     # Check that deleting a message we didn't send or receive fails

-    post :delete, :message_id => read_message.id
+    post :delete, :params => { :message_id => read_message.id }

     assert_response :not_found
     assert_template "no_such_message"
 
     assert_response :not_found
     assert_template "no_such_message"
 


@@ -448,7 +448,7 @@ class MessageControllerTest < ActionController::TestCase
     session[:user] = user.id
 
     # Check that the deleting a received message works
     session[:user] = user.id
 
     # Check that the deleting a received message works

-    post :delete, :message_id => read_message.id
+    post :delete, :params => { :message_id => read_message.id }

     assert_redirected_to inbox_path(:display_name => user.display_name)
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(read_message.id)
     assert_redirected_to inbox_path(:display_name => user.display_name)
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(read_message.id)


@@ -456,7 +456,7 @@ class MessageControllerTest < ActionController::TestCase
     assert_equal false, m.to_user_visible
 
     # Check that the deleting a sent message works
     assert_equal false, m.to_user_visible
 
     # Check that the deleting a sent message works

-    post :delete, :message_id => sent_message.id, :referer => outbox_path(:display_name => user.display_name)
+    post :delete, :params => { :message_id => sent_message.id, :referer => outbox_path(:display_name => user.display_name) }

     assert_redirected_to outbox_path(:display_name => user.display_name)
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(sent_message.id)
     assert_redirected_to outbox_path(:display_name => user.display_name)
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(sent_message.id)


@@ -469,7 +469,7 @@ class MessageControllerTest < ActionController::TestCase
     end
 
     # Asking to delete a message with a bogus ID should fail
     end
 
     # Asking to delete a message with a bogus ID should fail

-    post :delete, :message_id => 99999
+    post :delete, :params => { :message_id => 99999 }

     assert_response :not_found
     assert_template "no_such_message"
   end
     assert_response :not_found
     assert_template "no_such_message"
   end