Merge remote-tracking branch 'upstream/pull/2937' into master

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

diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb
index fd91fa6175df7875686553d6c6ca84f096c63c0c..364142dd9a669b4aaf52352d16dc57c46419c7ea 100644 (file)
--- a/test/controllers/traces_controller_test.rb
+++ b/test/controllers/traces_controller_test.rb
@@ -616,7 +616,7 @@ class TracesControllerTest < ActionDispatch::IntegrationTest
     session_for(user)
     post traces_path, :params => { :trace => { :gpx_file => file, :description => "", :tagstring => "new,trace", :visibility => "trackable" } }
     assert_template :new
-    assert_match "Description is too short (minimum is 1 character)", response.body
+    assert_match "is too short (minimum is 1 character)", response.body
   end
 
   # Test fetching the edit page for a trace using GET