X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dfe21fec82a03d5313d1c78c5f0e2390f0aef287..b8a8a88004d25837a10436fdc13128146b32c32b:/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..0b3a59b39 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -180,8 +180,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 +195,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