X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dfe21fec82a03d5313d1c78c5f0e2390f0aef287..81b37f9263ec0d76b60b3273e5f9d9a4345bfbfe:/test/controllers/messages_controller_test.rb?ds=sidebyside diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index 6d4e808f6..8e4d5eeb2 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -83,9 +83,11 @@ class MessagesControllerTest < ActionController::TestCase # 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" } } + perform_enqueued_jobs do + get :new, + :params => { :display_name => recipient_user.display_name, + :message => { :title => "Test Message", :body => "Test message body" } } + end end end assert_response :success @@ -112,9 +114,11 @@ class MessagesControllerTest < ActionController::TestCase # Check that the subject is preserved over errors assert_difference "ActionMailer::Base.deliveries.size", 0 do assert_difference "Message.count", 0 do - post :new, - :params => { :display_name => recipient_user.display_name, - :message => { :title => "Test Message", :body => "" } } + perform_enqueued_jobs do + post :new, + :params => { :display_name => recipient_user.display_name, + :message => { :title => "Test Message", :body => "" } } + end end end assert_response :success @@ -141,9 +145,11 @@ class MessagesControllerTest < ActionController::TestCase # 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, - :params => { :display_name => recipient_user.display_name, - :message => { :title => "", :body => "Test message body" } } + perform_enqueued_jobs do + post :new, + :params => { :display_name => recipient_user.display_name, + :message => { :title => "", :body => "Test message body" } } + end end end assert_response :success @@ -170,9 +176,11 @@ class MessagesControllerTest < ActionController::TestCase # Check that sending a message works assert_difference "ActionMailer::Base.deliveries.size", 1 do assert_difference "Message.count", 1 do - post :create, - :params => { :display_name => recipient_user.display_name, - :message => { :title => "Test Message", :body => "Test message body" } } + perform_enqueued_jobs do + post :create, + :params => { :display_name => recipient_user.display_name, + :message => { :title => "Test Message", :body => "Test message body" } } + end end end assert_redirected_to inbox_messages_path @@ -180,8 +188,8 @@ class MessagesControllerTest < ActionController::TestCase e = ActionMailer::Base.deliveries.first 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 + assert_match(/Test message body/, e.text_part.decoded) + assert_match(/Test message body/, e.html_part.decoded) assert_match %r{#{SERVER_URL}/messages/[0-9]+}, e.text_part.decoded ActionMailer::Base.deliveries.clear m = Message.last @@ -195,7 +203,7 @@ class MessagesControllerTest < ActionController::TestCase # Asking to send a message with a bogus user name should fail get :new, :params => { :display_name => "non_existent_user" } assert_response :not_found - assert_template "user/no_such_user" + assert_template "users/no_such_user" assert_select "h1", "The user non_existent_user does not exist" end @@ -211,12 +219,14 @@ class MessagesControllerTest < ActionController::TestCase assert_no_difference "ActionMailer::Base.deliveries.size" do assert_no_difference "Message.count" do with_message_limit(0) do - post :create, - :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/ + perform_enqueued_jobs do + post :create, + :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/ + end end end end