X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ccd11ebf3c8e119a04119a2e89ce6a879560578..35370684e503ef4c51a9b6798eef12d336ed1ee9:/test/controllers/traces_controller_test.rb diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb index daa8a6787..45b0358f5 100644 --- a/test/controllers/traces_controller_test.rb +++ b/test/controllers/traces_controller_test.rb @@ -388,7 +388,7 @@ class TracesControllerTest < ActionController::TestCase # And finally we should be able to do it with the owner of the trace get :data, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => anon_trace_file.user } - check_trace_data anon_trace_file, "66179ca44f1e93d8df62e2b88cbea732" + check_trace_data anon_trace_file, "db4cb5ed2d7d2b627b3b504296c4f701" end # Test downloading a trace that doesn't exist @@ -681,7 +681,7 @@ class TracesControllerTest < ActionController::TestCase def check_trace_feed(traces) assert_response :success assert_template "georss" - assert_equal "application/rss+xml", @response.content_type + assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do assert_select "channel", :count => 1 do assert_select "title" @@ -736,19 +736,19 @@ class TracesControllerTest < ActionController::TestCase def check_trace_data(trace, digest, content_type = "application/gpx+xml", extension = "gpx") assert_response :success assert_equal digest, Digest::MD5.hexdigest(response.body) - assert_equal content_type, response.content_type - assert_equal "attachment; filename=\"#{trace.id}.#{extension}\"", @response.header["Content-Disposition"] + assert_equal content_type, response.media_type + assert_equal "attachment; filename=\"#{trace.id}.#{extension}\"; filename*=UTF-8''#{trace.id}.#{extension}", @response.header["Content-Disposition"] end def check_trace_picture(trace) assert_response :success - assert_equal "image/gif", response.content_type + assert_equal "image/gif", response.media_type assert_equal trace.large_picture, response.body end def check_trace_icon(trace) assert_response :success - assert_equal "image/gif", response.content_type + assert_equal "image/gif", response.media_type assert_equal trace.icon_picture, response.body end end