Merge remote-tracking branch 'upstream/pull/5575'

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

diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
index d07f6c83d737f9c720fc7d348bd43101988a30bf..bdf88600cb9f75bae864dc1ea9fe4b2bd5938b50 100644 (file)
--- a/test/controllers/messages_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -1,19 +1,11 @@
 require "test_helper"
 
 require "test_helper"
 

-class MessagesControllerTest < ActionController::TestCase
+class MessagesControllerTest < ActionDispatch::IntegrationTest

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

-      { :path => "/messages/inbox", :method => :get },
-      { :controller => "messages", :action => "inbox" }
-    )
-    assert_routing(
-      { :path => "/messages/outbox", :method => :get },
-      { :controller => "messages", :action => "outbox" }
-    )
-    assert_routing(
-      { :path => "/message/new/username", :method => :get },
+      { :path => "/messages/new/username", :method => :get },

       { :controller => "messages", :action => "new", :display_name => "username" }
     )
     assert_routing(
       { :controller => "messages", :action => "new", :display_name => "username" }
     )
     assert_routing(


@@ -24,18 +16,6 @@ class MessagesControllerTest < ActionController::TestCase
       { :path => "/messages/1", :method => :get },
       { :controller => "messages", :action => "show", :id => "1" }
     )
       { :path => "/messages/1", :method => :get },
       { :controller => "messages", :action => "show", :id => "1" }
     )

-    assert_routing(
-      { :path => "/messages/1/mark", :method => :post },
-      { :controller => "messages", :action => "mark", :message_id => "1" }
-    )
-    assert_routing(
-      { :path => "/messages/1/reply", :method => :get },
-      { :controller => "messages", :action => "reply", :message_id => "1" }
-    )
-    assert_routing(
-      { :path => "/messages/1/reply", :method => :post },
-      { :controller => "messages", :action => "reply", :message_id => "1" }
-    )

     assert_routing(
       { :path => "/messages/1", :method => :delete },
       { :controller => "messages", :action => "destroy", :id => "1" }
     assert_routing(
       { :path => "/messages/1", :method => :delete },
       { :controller => "messages", :action => "destroy", :id => "1" }


@@ -47,8 +27,8 @@ class MessagesControllerTest < 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, :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
 
   ##
   end
 
   ##


@@ -57,13 +37,14 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
     # 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
 
     # 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_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
     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 +59,13 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
     # 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
 
     # 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
         end
       end
     end


@@ -109,15 +88,14 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
     # 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
 
     # 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
         end
       end
     end


@@ -140,15 +118,14 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
     # 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
 
     # 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
         end
       end
     end


@@ -171,19 +148,18 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
     # 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
 
     # 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
         end
       end
     end

-    assert_redirected_to inbox_messages_path
+    assert_redirected_to messages_outbox_path

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


@@ -195,13 +171,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
     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
     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"
     assert_response :not_found
     assert_template "users/no_such_user"
     assert_select "h1", "The user non_existent_user does not exist"


@@ -213,218 +189,68 @@ class MessagesControllerTest < ActionController::TestCase
     # Login as a normal user
     user = create(:user)
     recipient_user = create(:user)
     # 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
 
     # 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
           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_response :success
             assert_template "new"

-            assert_select ".error", /wait a while/
+            assert_select ".alert.alert-danger", /wait a while/

           end
         end
       end
     end
   end
 
           end
         end
       end
     end
   end
 

-  ##
-  # 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
-    get :reply, :params => { :message_id => unread_message.id }
-    assert_redirected_to login_path(:referer => message_reply_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, :params => { :message_id => unread_message.id }
-    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]
-
-    # Login as the right user
-    session[:user] = recipient_user.id
-
-    # Check that the message reply page loads
-    get :reply, :params => { :message_id => unread_message.id }
-    assert_response :success
-    assert_template "new"
-    assert_select "title", "Re: #{unread_message.title} | OpenStreetMap"
-    assert_select "form[action='/messages']", :count => 1 do
-      assert_select "input[type='hidden'][name='display_name'][value='#{user.display_name}']"
-      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 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
-
-    # Asking to reply to a message with a bogus ID should fail
-    get :reply, :params => { :message_id => 99999 }
-    assert_response :not_found
-    assert_template "no_such_message"
-  end
-

   ##
   # test the show action
   def test_show
     user = create(:user)
     recipient_user = create(:user)
     other_user = create(:user)
   ##
   # test the show action
   def test_show
     user = create(:user)
     recipient_user = create(:user)
     other_user = create(:user)

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

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

-    get :show, :params => { :id => unread_message.id }
-    assert_redirected_to login_path(:referer => message_path(:id => unread_message.id))
+    get message_path(message)
+    assert_redirected_to login_path(:referer => message_path(message))

 
     # Login as the wrong user
 
     # Login as the wrong user

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

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

-    get :show, :params => { :id => unread_message.id }
-    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]
+    get message_path(message)
+    assert_redirected_to login_path(:referer => message_path(message))
+    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
 
     # 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 }
+    # Check that the message sender can read the message and that Reply button is available
+    get message_path(message)

     assert_response :success
     assert_template "show"
     assert_response :success
     assert_template "show"

-    assert_not Message.find(unread_message.id).message_read
+    assert_select "a[href='#{user_path recipient_user}']", :text => recipient_user.display_name
+    assert_select "a.btn.btn-primary", :text => "Reply"
+    assert_not Message.find(message.id).message_read

 
     # Login as the message recipient
 
     # 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 }
+    # Check that the message recipient can read the message and that Reply button is available
+    get message_path(message)

     assert_response :success
     assert_template "show"
     assert_response :success
     assert_template "show"

-    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
+    assert_select "a[href='#{user_path user}']", :text => user.display_name
+    assert_select "a.btn.btn-primary", :text => "Reply"
+    assert Message.find(message.id).message_read

 
     # Asking to read a message with a bogus ID should fail
 
     # Asking to read a message with a bogus ID should fail

-    get :show, :params => { :id => 99999 }
-    assert_response :not_found
-    assert_template "no_such_message"
-  end
-
-  ##
-  # test the inbox action
-  def test_inbox
-    user = create(:user)
-    read_message = create(:message, :read, :recipient => user)
-    # Check that the inbox page requires us to login
-    get :inbox
-    assert_redirected_to login_path(:referer => inbox_messages_path)
-
-    # Login
-    session[:user] = user.id
-
-    # Check that we can view our inbox when logged in
-    get :inbox
-    assert_response :success
-    assert_template "inbox"
-    assert_select ".content-inner > table", :count => 1 do
-      assert_select "tr", :count => 2
-      assert_select "tr#inbox-#{read_message.id}.inbox-row", :count => 1
-    end
-  end
-
-  ##
-  # test the outbox action
-  def test_outbox
-    user = create(:user)
-    create(:message, :sender => user)
-
-    # Check that the outbox page requires us to login
-    get :outbox
-    assert_redirected_to login_path(:referer => outbox_messages_path)
-
-    # Login
-    session[:user] = user.id
-
-    # Check that we can view our outbox when logged in
-    get :outbox
-    assert_response :success
-    assert_template "outbox"
-    assert_select ".content-inner > table", :count => 1 do
-      assert_select "tr", :count => 2
-      assert_select "tr.inbox-row", :count => 1
-    end
-  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
-    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
-    post :mark, :params => { :message_id => unread_message.id }
-    assert_response :not_found
-    assert_template "no_such_message"
-
-    # Login as the message recipient_user
-    session[:user] = recipient_user.id
-
-    # Check that the marking a message read works
-    post :mark, :params => { :message_id => unread_message.id, :mark => "read" }
-    assert_redirected_to inbox_messages_path
-    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" }
-    assert_redirected_to inbox_messages_path
-    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 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_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
-
-    # Asking to mark a message with a bogus ID should fail
-    post :mark, :params => { :message_id => 99999 }
+    get message_path(99999)

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


@@ -439,55 +265,39 @@ class MessagesControllerTest < ActionController::TestCase
     sent_message = create(:message, :unread, :recipient => second_user, :sender => user)
 
     # Check that destroying a message requires us to login
     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(read_message)

     assert_response :forbidden
 
     # Login as a user with no messages
     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
 
     # Check that destroying a message we didn't send or receive fails

-    delete :destroy, :params => { :id => read_message.id }
+    delete message_path(read_message)

     assert_response :not_found
     assert_template "no_such_message"
 
     # Login as the message recipient_user
     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
 
     # Check that the destroy a received message works

-    delete :destroy, :params => { :id => read_message.id }
-    assert_redirected_to inbox_messages_path
+    delete message_path(read_message)
+    assert_redirected_to messages_inbox_path

     assert_equal "Message deleted", flash[:notice]
     m = Message.find(read_message.id)
     assert m.from_user_visible
     assert_not m.to_user_visible
 
     # Check that the destroying a sent message works
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(read_message.id)
     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 }
-    assert_redirected_to outbox_messages_path
+    delete message_path(sent_message, :referer => messages_outbox_path)
+    assert_redirected_to messages_outbox_path

     assert_equal "Message deleted", flash[:notice]
     m = Message.find(sent_message.id)
     assert_not m.from_user_visible
     assert m.to_user_visible
 
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(sent_message.id)
     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
-

     # Asking to destroy a message with a bogus ID should fail
     # Asking to destroy a message with a bogus ID should fail

-    delete :destroy, :params => { :id => 99999 }
+    delete message_path(99999)

     assert_response :not_found
     assert_template "no_such_message"
   end
     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
 end