Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p

[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 427519c3220a0fbd1acf4b83302f3ac071e5b3f4..8a7ae70de6c34a96f1a92194839819f56a5ccc95 100644 (file)
--- a/test/controllers/message_controller_test.rb
+++ b/test/controllers/message_controller_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class MessageControllerTest < ActionController::TestCase
 require "test_helper"
 
 class MessageControllerTest < ActionController::TestCase

-  fixtures :users, :messages
-

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -45,90 +43,152 @@ class MessageControllerTest < ActionController::TestCase
   end
 
   ##
   end
 
   ##

-  # test the new action
-  def test_new
+  # test fetching new message page when not logged in
+  def test_new_no_login

     # Check that the new message page requires us to login
     # Check that the new message page requires us to login

-    get :new, :display_name => users(:public_user).display_name
-    assert_redirected_to login_path(:referer => new_message_path(:display_name => users(:public_user).display_name))
+    user = create(:user)
+    get :new, :params => { :display_name => user.display_name }
+    assert_redirected_to login_path(:referer => new_message_path(:display_name => user.display_name))
+  end

 
 

+  ##
+  # test fetching new message page when logged in
+  def test_new_form

     # Login as a normal user
     # Login as a normal user

-    session[:user] = users(:normal_user).id
+    user = create(:user)
+    recipient_user = create(:user)
+    session[:user] = user.id

 
     # Check that the new message page loads
 
     # Check that the new message page loads

-    get :new, :display_name => users(:public_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"

-    assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do
+    assert_select "form[action='#{new_message_path(:display_name => recipient_user.display_name)}']", :count => 1 do

       assert_select "input#message_title", :count => 1
       assert_select "textarea#message_body", :count => 1
       assert_select "input[type='submit'][value='Send']", :count => 1
     end
       assert_select "input#message_title", :count => 1
       assert_select "textarea#message_body", :count => 1
       assert_select "input[type='submit'][value='Send']", :count => 1
     end

+  end
+
+  ##
+  # test fetching new message page with body and title
+  def test_new_get_with_params
+    # Login as a normal user
+    user = create(:user)
+    recipient_user = create(:user)
+    session[:user] = user.id
+
+    # Check that we can't send a message from a GET request
+    assert_difference "ActionMailer::Base.deliveries.size", 0 do
+      assert_difference "Message.count", 0 do
+        get :new,
+            :params => { :display_name => recipient_user.display_name,
+                         :message => { :title => "Test Message", :body => "Test message body" } }
+      end
+    end
+    assert_response :success
+    assert_template "new"
+    assert_select "title", "OpenStreetMap | Send message"
+    assert_select "form[action='#{new_message_path(:display_name => recipient_user.display_name)}']", :count => 1 do
+      assert_select "input#message_title", :count => 1 do
+        assert_select "[value='Test Message']"
+      end
+      assert_select "textarea#message_body", :text => "Test message body", :count => 1
+      assert_select "input[type='submit'][value='Send']", :count => 1
+    end
+  end
+
+  ##
+  # test posting new message page with no body
+  def test_new_post_no_body
+    # Login as a normal user
+    user = create(:user)
+    recipient_user = create(:user)
+    session[:user] = user.id

 
     # Check that the subject is preserved over errors
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         post :new,
 
     # Check that the subject is preserved over errors
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         post :new,

-             :display_name => users(:public_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
     assert_template "new"
     assert_select "title", "OpenStreetMap | Send message"
       end
     end
     assert_response :success
     assert_template "new"
     assert_select "title", "OpenStreetMap | Send message"

-    assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do
+    assert_select "form[action='#{new_message_path(:display_name => recipient_user.display_name)}']", :count => 1 do

       assert_select "input#message_title", :count => 1 do
         assert_select "[value='Test Message']"
       end
       assert_select "textarea#message_body", :text => "", :count => 1
       assert_select "input[type='submit'][value='Send']", :count => 1
     end
       assert_select "input#message_title", :count => 1 do
         assert_select "[value='Test Message']"
       end
       assert_select "textarea#message_body", :text => "", :count => 1
       assert_select "input[type='submit'][value='Send']", :count => 1
     end

+  end
+
+  ##
+  # test posting new message page with no title
+  def test_new_post_no_title
+    # Login as a normal user
+    user = create(:user)
+    recipient_user = create(:user)
+    session[:user] = user.id

 
     # Check that the body text is preserved over errors
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         post :new,
 
     # Check that the body text is preserved over errors
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         post :new,

-             :display_name => users(:public_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
     assert_template "new"
     assert_select "title", "OpenStreetMap | Send message"
       end
     end
     assert_response :success
     assert_template "new"
     assert_select "title", "OpenStreetMap | Send message"

-    assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do
+    assert_select "form[action='#{new_message_path(:display_name => recipient_user.display_name)}']", :count => 1 do

       assert_select "input#message_title", :count => 1 do
         assert_select "[value='']"
       end
       assert_select "textarea#message_body", :text => "Test message body", :count => 1
       assert_select "input[type='submit'][value='Send']", :count => 1
     end
       assert_select "input#message_title", :count => 1 do
         assert_select "[value='']"
       end
       assert_select "textarea#message_body", :text => "Test message body", :count => 1
       assert_select "input[type='submit'][value='Send']", :count => 1
     end

+  end
+
+  ##
+  # test posting new message page sends message
+  def test_new_post_send
+    # Login as a normal user
+    user = create(:user)
+    recipient_user = create(:user)
+    session[:user] = user.id

 
     # Check that sending a message works
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "Message.count", 1 do
         post :new,
 
     # Check that sending a message works
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "Message.count", 1 do
         post :new,

-             :display_name => users(:public_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
       end
     end

-    assert_redirected_to inbox_path(:display_name => users(:normal_user).display_name)
+    assert_redirected_to inbox_path(:display_name => user.display_name)

     assert_equal "Message sent", flash[:notice]
     e = ActionMailer::Base.deliveries.first
     assert_equal "Message sent", flash[:notice]
     e = ActionMailer::Base.deliveries.first

-    assert_equal [users(:public_user).email], e.to
+    assert_equal [recipient_user.email], e.to

     assert_equal "[OpenStreetMap] Test Message", e.subject
     assert_match /Test message body/, e.text_part.decoded
     assert_match /Test message body/, e.html_part.decoded
     ActionMailer::Base.deliveries.clear
     assert_equal "[OpenStreetMap] Test Message", e.subject
     assert_match /Test message body/, e.text_part.decoded
     assert_match /Test message body/, e.html_part.decoded
     ActionMailer::Base.deliveries.clear

-    m = Message.find(3)
-    assert_equal users(:normal_user).id, m.from_user_id
-    assert_equal users(:public_user).id, m.to_user_id
+    m = Message.last
+    assert_equal user.id, m.from_user_id
+    assert_equal recipient_user.id, m.to_user_id

     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
 
     # Asking to send a message with a bogus user name should fail
     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
 
     # 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"


@@ -138,15 +198,17 @@ class MessageControllerTest < ActionController::TestCase
   # test the new action message limit
   def test_new_limit
     # Login as a normal user
   # test the new action message limit
   def test_new_limit
     # Login as a normal user

-    session[:user] = users(:normal_user).id
+    user = create(:user)
+    recipient_user = create(:user)
+    session[:user] = user.id

 
     # Check that sending a message fails when the message limit is hit
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       assert_no_difference "Message.count" do
         with_message_limit(0) do
           post :new,
 
     # Check that sending a message fails when the message limit is hit
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       assert_no_difference "Message.count" do
         with_message_limit(0) do
           post :new,

-               :display_name => users(:public_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/


@@ -158,32 +220,37 @@ class MessageControllerTest < ActionController::TestCase
   ##
   # test the reply action
   def test_reply
   ##
   # test the reply action
   def test_reply

+    user = create(:user)
+    recipient_user = create(:user)
+    other_user = create(:user)
+    unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
+

     # Check that the message reply page requires us to login
     # Check that the message reply page requires us to login

-    get :reply, :message_id => messages(:unread_message).id
-    assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(: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
 
     # Login as the wrong user

-    session[:user] = users(:second_public_user).id
+    session[:user] = other_user.id

 
     # Check that we can't reply to somebody else's message
 
     # Check that we can't reply to somebody else's message

-    get :reply, :message_id => messages(:unread_message).id
-    assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:unread_message).id))
-    assert_equal "You are logged in as `pulibc_test2' 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]
+    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]

 
     # Login as the right user
 
     # Login as the right user

-    session[:user] = users(:public_user).id
+    session[:user] = recipient_user.id

 
     # Check that the message reply page loads
 
     # Check that the message reply page loads

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

     assert_response :success
     assert_template "new"
     assert_response :success
     assert_template "new"

-    assert_select "title", "OpenStreetMap | Re: test message 1"
-    assert_select "form[action='#{new_message_path(:display_name => users(:normal_user).display_name)}']", :count => 1 do
-      assert_select "input#message_title[value='Re: test message 1']", :count => 1
+    assert_select "title", "OpenStreetMap | Re: #{unread_message.title}"
+    assert_select "form[action='#{new_message_path(:display_name => user.display_name)}']", :count => 1 do
+      assert_select "input#message_title[value='Re: #{unread_message.title}']", :count => 1

       assert_select "textarea#message_body", :count => 1
       assert_select "input[type='submit'][value='Send']", :count => 1
     end
       assert_select "textarea#message_body", :count => 1
       assert_select "input[type='submit'][value='Send']", :count => 1
     end

-    assert_equal true, Message.find(messages(:unread_message).id).message_read
+    assert_equal true, Message.find(unread_message.id).message_read

 
     # Asking to reply to a message with no ID should fail
     assert_raise ActionController::UrlGenerationError do
 
     # Asking to reply to a message with no ID should fail
     assert_raise ActionController::UrlGenerationError do


@@ -191,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


@@ -199,35 +266,40 @@ class MessageControllerTest < ActionController::TestCase
   ##
   # test the read action
   def test_read
   ##
   # test the read action
   def test_read

+    user = create(:user)
+    recipient_user = create(:user)
+    other_user = create(:user)
+    unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
+

     # Check that the read message page requires us to login
     # Check that the read message page requires us to login

-    get :read, :message_id => messages(:unread_message).id
-    assert_redirected_to login_path(:referer => read_message_path(:message_id => messages(: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
 
     # Login as the wrong user

-    session[:user] = users(:second_public_user).id
+    session[:user] = other_user.id

 
     # Check that we can't read the message
 
     # Check that we can't read the message

-    get :read, :message_id => messages(:unread_message).id
-    assert_redirected_to login_path(:referer => read_message_path(:message_id => messages(:unread_message).id))
-    assert_equal "You are logged in as `pulibc_test2' 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]
+    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]

 
     # Login as the message sender
 
     # Login as the message sender

-    session[:user] = users(:normal_user).id
+    session[:user] = user.id

 
     # Check that the message sender can read the message
 
     # Check that the message sender can read the message

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

     assert_response :success
     assert_template "read"
     assert_response :success
     assert_template "read"

-    assert_equal false, Message.find(messages(:unread_message).id).message_read
+    assert_equal false, Message.find(unread_message.id).message_read

 
     # Login as the message recipient
 
     # Login as the message recipient

-    session[:user] = users(:public_user).id
+    session[:user] = recipient_user.id

 
     # Check that the message recipient can read the message
 
     # Check that the message recipient can read the message

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

     assert_response :success
     assert_template "read"
     assert_response :success
     assert_template "read"

-    assert_equal true, Message.find(messages(:unread_message).id).message_read
+    assert_equal true, Message.find(unread_message.id).message_read

 
     # Asking to read a message with no ID should fail
     assert_raise ActionController::UrlGenerationError do
 
     # Asking to read a message with no ID should fail
     assert_raise ActionController::UrlGenerationError do


@@ -235,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


@@ -243,39 +315,46 @@ class MessageControllerTest < ActionController::TestCase
   ##
   # test the inbox action
   def test_inbox
   ##
   # test the inbox action
   def test_inbox

+    user = create(:user)
+    other_user = create(:user)
+    read_message = create(:message, :read, :recipient => user)

     # Check that the inbox page requires us to login
     # Check that the inbox page requires us to login

-    get :inbox, :display_name => users(:normal_user).display_name
-    assert_redirected_to login_path(:referer => inbox_path(:display_name => users(:normal_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
 
     # Login

-    session[:user] = users(:normal_user).id
+    session[:user] = user.id

 
     # Check that we can view our inbox when logged in
 
     # Check that we can view our inbox when logged in

-    get :inbox, :display_name => users(:normal_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_select "tr", :count => 2
     assert_response :success
     assert_template "inbox"
     assert_select "table.messages", :count => 1 do
       assert_select "tr", :count => 2

-      assert_select "tr#inbox-#{messages(:read_message).id}.inbox-row", :count => 1
+      assert_select "tr#inbox-#{read_message.id}.inbox-row", :count => 1

     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 => users(:public_user).display_name
-    assert_redirected_to inbox_path(:display_name => users(:normal_user).display_name)
+    get :inbox, :params => { :display_name => other_user.display_name }
+    assert_redirected_to inbox_path(:display_name => user.display_name)

   end
 
   ##
   # test the outbox action
   def test_outbox
   end
 
   ##
   # test the outbox action
   def test_outbox

+    user = create(:user)
+    other_user = create(:user)
+    create(:message, :sender => user)
+

     # Check that the outbox page requires us to login
     # Check that the outbox page requires us to login

-    get :outbox, :display_name => users(:normal_user).display_name
-    assert_redirected_to login_path(:referer => outbox_path(:display_name => users(:normal_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
 
     # Login

-    session[:user] = users(:normal_user).id
+    session[:user] = user.id

 
     # Check that we can view our outbox when logged in
 
     # Check that we can view our outbox when logged in

-    get :outbox, :display_name => users(:normal_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


@@ -284,49 +363,54 @@ 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 => users(:public_user).display_name
-    assert_redirected_to outbox_path(:display_name => users(:normal_user).display_name)
+    get :outbox, :params => { :display_name => other_user.display_name }
+    assert_redirected_to outbox_path(:display_name => user.display_name)

   end
 
   ##
   # test the mark action
   def test_mark
   end
 
   ##
   # test the mark action
   def test_mark

+    user = create(:user)
+    recipient_user = create(:user)
+    other_user = create(:user)
+    unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
+

     # Check that the marking a message requires us to login
     # Check that the marking a message requires us to login

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

     assert_response :forbidden
 
     # Login as a user with no messages
     assert_response :forbidden
 
     # Login as a user with no messages

-    session[:user] = users(:second_public_user).id
+    session[:user] = other_user.id

 
     # Check that marking a message we didn't send or receive fails
 
     # Check that marking a message we didn't send or receive fails

-    post :mark, :message_id => messages(:read_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"
 

-    # Login as the message recipient
-    session[:user] = users(:public_user).id
+    # Login as the message recipient_user
+    session[:user] = recipient_user.id

 
     # Check that the marking a message read works
 
     # Check that the marking a message read works

-    post :mark, :message_id => messages(:unread_message).id, :mark => "read"
-    assert_redirected_to inbox_path(:display_name => users(:public_user).display_name)
-    assert_equal true, Message.find(messages(:unread_message).id).message_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
 
     # Check that the marking a message unread works

-    post :mark, :message_id => messages(:unread_message).id, :mark => "unread"
-    assert_redirected_to inbox_path(:display_name => users(:public_user).display_name)
-    assert_equal false, Message.find(messages(:unread_message).id).message_read
+    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
 
     # Check that the marking a message read via XHR works

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

     assert_response :success
     assert_template "mark"
     assert_response :success
     assert_template "mark"

-    assert_equal true, Message.find(messages(:unread_message).id).message_read
+    assert_equal true, Message.find(unread_message.id).message_read

 
     # Check that the marking a message unread via XHR works
 
     # Check that the marking a message unread via XHR works

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

     assert_response :success
     assert_template "mark"
     assert_response :success
     assert_template "mark"

-    assert_equal false, Message.find(messages(:unread_message).id).message_read
+    assert_equal false, Message.find(unread_message.id).message_read

 
     # Asking to mark a message with no ID should fail
     assert_raise ActionController::UrlGenerationError do
 
     # Asking to mark a message with no ID should fail
     assert_raise ActionController::UrlGenerationError do


@@ -334,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


@@ -342,34 +426,40 @@ class MessageControllerTest < ActionController::TestCase
   ##
   # test the delete action
   def test_delete
   ##
   # test the delete action
   def test_delete

+    user = create(:user)
+    second_user = create(:user)
+    other_user = create(:user)
+    read_message = create(:message, :read, :recipient => user, :sender => second_user)
+    sent_message = create(:message, :unread, :recipient => second_user, :sender => user)
+

     # Check that the deleting a message requires us to login
     # Check that the deleting a message requires us to login

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

     assert_response :forbidden
 
     # Login as a user with no messages
     assert_response :forbidden
 
     # Login as a user with no messages

-    session[:user] = users(:second_public_user).id
+    session[:user] = other_user.id

 
     # Check that deleting a message we didn't send or receive fails
 
     # Check that deleting a message we didn't send or receive fails

-    post :delete, :message_id => messages(: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"
 

-    # Login as the message recipient
-    session[:user] = users(:normal_user).id
+    # Login as the message recipient_user
+    session[:user] = user.id

 
     # Check that the deleting a received message works
 
     # Check that the deleting a received message works

-    post :delete, :message_id => messages(:read_message).id
-    assert_redirected_to inbox_path(:display_name => users(:normal_user).display_name)
+    post :delete, :params => { :message_id => read_message.id }
+    assert_redirected_to inbox_path(:display_name => user.display_name)

     assert_equal "Message deleted", flash[:notice]
     assert_equal "Message deleted", flash[:notice]

-    m = Message.find(messages(:read_message).id)
+    m = Message.find(read_message.id)

     assert_equal true, m.from_user_visible
     assert_equal false, m.to_user_visible
 
     # Check that the deleting a sent message works
     assert_equal true, m.from_user_visible
     assert_equal false, m.to_user_visible
 
     # Check that the deleting a sent message works

-    post :delete, :message_id => messages(:unread_message).id, :referer => outbox_path(:display_name => users(:normal_user).display_name)
-    assert_redirected_to outbox_path(:display_name => users(:normal_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]
     assert_equal "Message deleted", flash[:notice]

-    m = Message.find(messages(:unread_message).id)
+    m = Message.find(sent_message.id)

     assert_equal false, m.from_user_visible
     assert_equal true, m.to_user_visible
 
     assert_equal false, m.from_user_visible
     assert_equal true, m.to_user_visible
 


@@ -379,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