X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dcfe326f6515cc7aeb9c02b7536e69863c60cd01..212fe75b6fd26d01dfacf31650e7f71eb7f06a63:/test/controllers/messages_controller_test.rb?ds=inline

diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
index 0348163ba..40581993f 100644
--- a/test/controllers/messages_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class MessagesControllerTest < ActionController::TestCase
+class MessagesControllerTest < ActionDispatch::IntegrationTest
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -47,8 +47,8 @@ class MessagesControllerTest < ActionController::TestCase
   def test_new_no_login
     # Check that the new message page requires us to login
     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))
+    get new_message_path(user)
+    assert_redirected_to login_path(:referer => new_message_path(user))
   end
 
   ##
@@ -57,13 +57,14 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
-    session[:user] = user.id
+    session_for(user)
 
     # Check that the new message page loads
-    get :new, :params => { :display_name => recipient_user.display_name }
+    get new_message_path(recipient_user)
     assert_response :success
     assert_template "new"
     assert_select "title", "Send message | OpenStreetMap"
+    assert_select "a[href='#{user_path recipient_user}']", :text => recipient_user.display_name
     assert_select "form[action='/messages']", :count => 1 do
       assert_select "input[type='hidden'][name='display_name'][value='#{recipient_user.display_name}']"
       assert_select "input#message_title", :count => 1
@@ -78,15 +79,13 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
-    session[:user] = user.id
+    session_for(user)
 
     # 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
         perform_enqueued_jobs do
-          get :new,
-              :params => { :display_name => recipient_user.display_name,
-                           :message => { :title => "Test Message", :body => "Test message body" } }
+          get new_message_path(recipient_user, :message => { :title => "Test Message", :body => "Test message body" })
         end
       end
     end
@@ -109,15 +108,14 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
-    session[:user] = user.id
+    session_for(user)
 
     # Check that the subject is preserved over errors
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         perform_enqueued_jobs do
-          post :new,
-               :params => { :display_name => recipient_user.display_name,
-                            :message => { :title => "Test Message", :body => "" } }
+          post messages_path(:display_name => recipient_user.display_name,
+                             :message => { :title => "Test Message", :body => "" })
         end
       end
     end
@@ -140,15 +138,14 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
-    session[:user] = user.id
+    session_for(user)
 
     # Check that the body text is preserved over errors
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
         perform_enqueued_jobs do
-          post :new,
-               :params => { :display_name => recipient_user.display_name,
-                            :message => { :title => "", :body => "Test message body" } }
+          post messages_path(:display_name => recipient_user.display_name,
+                             :message => { :title => "", :body => "Test message body" })
         end
       end
     end
@@ -171,15 +168,14 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
-    session[:user] = user.id
+    session_for(user)
 
     # Check that sending a message works
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "Message.count", 1 do
         perform_enqueued_jobs do
-          post :create,
-               :params => { :display_name => recipient_user.display_name,
-                            :message => { :title => "Test Message", :body => "Test message body" } }
+          post messages_path(:display_name => recipient_user.display_name,
+                             :message => { :title => "Test Message", :body => "Test message body" })
         end
       end
     end
@@ -195,13 +191,13 @@ class MessagesControllerTest < ActionController::TestCase
     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_in_delta Time.now.utc, 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, :params => { :display_name => "non_existent_user" }
+    get new_message_path("non_existent_user")
     assert_response :not_found
     assert_template "users/no_such_user"
     assert_select "h1", "The user non_existent_user does not exist"
@@ -213,19 +209,18 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
-    session[:user] = user.id
+    session_for(user)
 
     # 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
+        with_settings(:max_messages_per_hour => 0) do
           perform_enqueued_jobs do
-            post :create,
-                 :params => { :display_name => recipient_user.display_name,
-                              :message => { :title => "Test Message", :body => "Test message body" } }
+            post messages_path(: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_select ".alert.alert-danger", /wait a while/
           end
         end
       end
@@ -241,22 +236,22 @@ class MessagesControllerTest < ActionController::TestCase
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the message reply page requires us to login
-    get :reply, :params => { :message_id => unread_message.id }
+    get message_reply_path(:message_id => unread_message)
     assert_redirected_to login_path(:referer => message_reply_path(:message_id => unread_message.id))
 
     # Login as the wrong user
-    session[:user] = other_user.id
+    session_for(other_user)
 
     # Check that we can't reply to somebody else's message
-    get :reply, :params => { :message_id => unread_message.id }
+    get message_reply_path(:message_id => unread_message)
     assert_redirected_to login_path(:referer => message_reply_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_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 log in as the correct user in order to reply.", flash[:notice]
 
     # Login as the right user
-    session[:user] = recipient_user.id
+    session_for(recipient_user)
 
     # Check that the message reply page loads
-    get :reply, :params => { :message_id => unread_message.id }
+    get message_reply_path(:message_id => unread_message)
     assert_response :success
     assert_template "new"
     assert_select "title", "Re: #{unread_message.title} | OpenStreetMap"
@@ -266,15 +261,14 @@ class MessagesControllerTest < ActionController::TestCase
       assert_select "textarea#message_body", :count => 1
       assert_select "input[type='submit'][value='Send']", :count => 1
     end
-    assert_equal true, Message.find(unread_message.id).message_read
+    assert Message.find(unread_message.id).message_read
 
     # Asking to reply to a message with no ID should fail
-    assert_raise ActionController::UrlGenerationError do
-      get :reply
-    end
+    get message_reply_path
+    assert_response :success
 
     # Asking to reply to a message with a bogus ID should fail
-    get :reply, :params => { :message_id => 99999 }
+    get message_reply_path(:message_id => 99999)
     assert_response :not_found
     assert_template "no_such_message"
   end
@@ -288,42 +282,43 @@ class MessagesControllerTest < ActionController::TestCase
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the show message page requires us to login
-    get :show, :params => { :id => unread_message.id }
+    get message_path(:id => unread_message)
     assert_redirected_to login_path(:referer => message_path(:id => unread_message.id))
 
     # Login as the wrong user
-    session[:user] = other_user.id
+    session_for(other_user)
 
     # Check that we can't read the message
-    get :show, :params => { :id => unread_message.id }
+    get message_path(:id => unread_message)
     assert_redirected_to login_path(:referer => message_path(: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_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 log in as the correct user in order to read it.", flash[:notice]
 
     # Login as the message sender
-    session[:user] = user.id
+    session_for(user)
 
     # Check that the message sender can read the message
-    get :show, :params => { :id => unread_message.id }
+    get message_path(:id => unread_message)
     assert_response :success
     assert_template "show"
-    assert_equal false, Message.find(unread_message.id).message_read
+    assert_select "a[href='#{user_path recipient_user}']", :text => recipient_user.display_name
+    assert_not Message.find(unread_message.id).message_read
 
     # Login as the message recipient
-    session[:user] = recipient_user.id
+    session_for(recipient_user)
 
     # Check that the message recipient can read the message
-    get :show, :params => { :id => unread_message.id }
+    get message_path(:id => unread_message)
     assert_response :success
     assert_template "show"
-    assert_equal true, Message.find(unread_message.id).message_read
+    assert_select "a[href='#{user_path user}']", :text => user.display_name
+    assert Message.find(unread_message.id).message_read
 
     # Asking to read a message with no ID should fail
-    assert_raise ActionController::UrlGenerationError do
-      get :show
-    end
+    get message_path
+    assert_response :success
 
     # Asking to read a message with a bogus ID should fail
-    get :show, :params => { :id => 99999 }
+    get message_path(:id => 99999)
     assert_response :not_found
     assert_template "no_such_message"
   end
@@ -334,19 +329,22 @@ class MessagesControllerTest < ActionController::TestCase
     user = create(:user)
     read_message = create(:message, :read, :recipient => user)
     # Check that the inbox page requires us to login
-    get :inbox
+    get inbox_messages_path
     assert_redirected_to login_path(:referer => inbox_messages_path)
 
     # Login
-    session[:user] = user.id
+    session_for(user)
 
     # Check that we can view our inbox when logged in
-    get :inbox
+    get inbox_messages_path
     assert_response :success
     assert_template "inbox"
-    assert_select "table.messages", :count => 1 do
+    assert_select ".content-inner > table", :count => 1 do
       assert_select "tr", :count => 2
-      assert_select "tr#inbox-#{read_message.id}.inbox-row", :count => 1
+      assert_select "tr#inbox-#{read_message.id}.inbox-row", :count => 1 do
+        assert_select "a[href='#{user_path read_message.sender}']", :text => read_message.sender.display_name
+        assert_select "a[href='#{message_path read_message}']", :text => read_message.title
+      end
     end
   end
 
@@ -354,22 +352,25 @@ class MessagesControllerTest < ActionController::TestCase
   # test the outbox action
   def test_outbox
     user = create(:user)
-    create(:message, :sender => user)
+    message = create(:message, :sender => user)
 
     # Check that the outbox page requires us to login
-    get :outbox
+    get outbox_messages_path
     assert_redirected_to login_path(:referer => outbox_messages_path)
 
     # Login
-    session[:user] = user.id
+    session_for(user)
 
     # Check that we can view our outbox when logged in
-    get :outbox
+    get outbox_messages_path
     assert_response :success
     assert_template "outbox"
-    assert_select "table.messages", :count => 1 do
+    assert_select ".content-inner > table", :count => 1 do
       assert_select "tr", :count => 2
-      assert_select "tr.inbox-row", :count => 1
+      assert_select "tr.inbox-row", :count => 1 do
+        assert_select "a[href='#{user_path message.recipient}']", :text => message.recipient.display_name
+        assert_select "a[href='#{message_path message}']", :text => message.title
+      end
     end
   end
 
@@ -382,49 +383,46 @@ class MessagesControllerTest < ActionController::TestCase
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the marking a message requires us to login
-    post :mark, :params => { :message_id => unread_message.id }
+    post message_mark_path(:message_id => unread_message)
     assert_response :forbidden
 
     # Login as a user with no messages
-    session[:user] = other_user.id
+    session_for(other_user)
 
     # Check that marking a message we didn't send or receive fails
-    post :mark, :params => { :message_id => unread_message.id }
+    post message_mark_path(:message_id => unread_message)
     assert_response :not_found
     assert_template "no_such_message"
 
     # Login as the message recipient_user
-    session[:user] = recipient_user.id
+    session_for(recipient_user)
 
     # Check that the marking a message read works
-    post :mark, :params => { :message_id => unread_message.id, :mark => "read" }
+    post message_mark_path(:message_id => unread_message, :mark => "read")
     assert_redirected_to inbox_messages_path
-    assert_equal true, Message.find(unread_message.id).message_read
+    assert Message.find(unread_message.id).message_read
 
     # Check that the marking a message unread works
-    post :mark, :params => { :message_id => unread_message.id, :mark => "unread" }
+    post message_mark_path(:message_id => unread_message, :mark => "unread")
     assert_redirected_to inbox_messages_path
-    assert_equal false, Message.find(unread_message.id).message_read
+    assert_not Message.find(unread_message.id).message_read
 
     # Check that the marking a message read via XHR works
-    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
+    post message_mark_path(:message_id => unread_message, :mark => "read")
+    assert_response :see_other
+    assert Message.find(unread_message.id).message_read
 
     # Check that the marking a message unread via XHR works
-    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
+    post message_mark_path(:message_id => unread_message, :mark => "unread")
+    assert_response :see_other
+    assert_not Message.find(unread_message.id).message_read
 
     # Asking to mark a message with no ID should fail
-    assert_raise ActionController::UrlGenerationError do
-      post :mark
-    end
+    post message_mark_path
+    assert_redirected_to inbox_messages_path
 
     # Asking to mark a message with a bogus ID should fail
-    post :mark, :params => { :message_id => 99999 }
+    post message_mark_path(:message_id => 99999)
     assert_response :not_found
     assert_template "no_such_message"
   end
@@ -439,55 +437,43 @@ class MessagesControllerTest < ActionController::TestCase
     sent_message = create(:message, :unread, :recipient => second_user, :sender => user)
 
     # Check that destroying a message requires us to login
-    delete :destroy, :params => { :id => read_message.id }
+    delete message_path(:id => read_message)
     assert_response :forbidden
 
     # Login as a user with no messages
-    session[:user] = other_user.id
+    session_for(other_user)
 
     # Check that destroying a message we didn't send or receive fails
-    delete :destroy, :params => { :id => read_message.id }
+    delete message_path(:id => read_message)
     assert_response :not_found
     assert_template "no_such_message"
 
     # Login as the message recipient_user
-    session[:user] = user.id
+    session_for(user)
 
     # Check that the destroy a received message works
-    delete :destroy, :params => { :id => read_message.id }
+    delete message_path(:id => read_message)
     assert_redirected_to inbox_messages_path
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(read_message.id)
-    assert_equal true, m.from_user_visible
-    assert_equal false, m.to_user_visible
+    assert m.from_user_visible
+    assert_not m.to_user_visible
 
     # Check that the destroying a sent message works
-    delete :destroy, :params => { :id => sent_message.id, :referer => outbox_messages_path }
+    delete message_path(:id => sent_message, :referer => outbox_messages_path)
     assert_redirected_to outbox_messages_path
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(sent_message.id)
-    assert_equal false, m.from_user_visible
-    assert_equal true, m.to_user_visible
+    assert_not m.from_user_visible
+    assert m.to_user_visible
 
     # Asking to destroy a message with no ID should fail
-    assert_raise ActionController::UrlGenerationError do
-      post :destroy
-    end
+    delete message_path
+    assert_redirected_to inbox_messages_path
 
     # Asking to destroy a message with a bogus ID should fail
-    delete :destroy, :params => { :id => 99999 }
+    delete message_path(:id => 99999)
     assert_response :not_found
     assert_template "no_such_message"
   end
-
-  private
-
-  def with_message_limit(value)
-    max_messages_per_hour = Settings.max_messages_per_hour
-    Settings.max_messages_per_hour = value
-
-    yield
-
-    Settings.max_messages_per_hour = max_messages_per_hour
-  end
 end