X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5444af981c8c3161ed7991d0fb0fd7463175fc7e..2e3522a2f6fafe1b06124d517fff30b32729397b:/test/controllers/api/traces_controller_test.rb

diff --git a/test/controllers/api/traces_controller_test.rb b/test/controllers/api/traces_controller_test.rb
index 24ff6ee66..14136ec20 100644
--- a/test/controllers/api/traces_controller_test.rb
+++ b/test/controllers/api/traces_controller_test.rb
@@ -1,11 +1,21 @@
 require "test_helper"
-require "minitest/mock"
 
 module Api
   class TracesControllerTest < ActionController::TestCase
+    # Use temporary directories with unique names for each test
+    # This allows the tests to be run in parallel.
+    def setup
+      @gpx_trace_dir_orig = Settings.gpx_trace_dir
+      @gpx_image_dir_orig = Settings.gpx_image_dir
+      Settings.gpx_trace_dir = Dir.mktmpdir("trace", Rails.root.join("test/gpx"))
+      Settings.gpx_image_dir = Dir.mktmpdir("image", Rails.root.join("test/gpx"))
+    end
+
     def teardown
-      File.unlink(*Dir.glob(File.join(Settings.gpx_trace_dir, "*.gpx")))
-      File.unlink(*Dir.glob(File.join(Settings.gpx_image_dir, "*.gif")))
+      FileUtils.remove_dir(Settings.gpx_trace_dir)
+      FileUtils.remove_dir(Settings.gpx_image_dir)
+      Settings.gpx_trace_dir = @gpx_trace_dir_orig
+      Settings.gpx_image_dir = @gpx_image_dir_orig
     end
 
     ##
@@ -153,7 +163,7 @@ module Api
       # And finally we should be able to do it with the owner of the trace
       basic_authorization anon_trace_file.user.display_name, "test"
       get :data, :params => { :id => anon_trace_file.id }
-      check_trace_data anon_trace_file, "66179ca44f1e93d8df62e2b88cbea732"
+      check_trace_data anon_trace_file, "db4cb5ed2d7d2b627b3b504296c4f701"
     end
 
     # Test downloading a trace that doesn't exist through the api
@@ -178,7 +188,7 @@ module Api
     # Test creating a trace through the api
     def test_create
       # Get file to use
-      fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx")
+      fixture = Rails.root.join("test/gpx/fixtures/a.gpx")
       file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml")
       user = create(:user)
 
@@ -200,7 +210,7 @@ module Api
       assert_equal "New Trace", trace.description
       assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
       assert_equal "trackable", trace.visibility
-      assert_equal false, trace.inserted
+      assert_not trace.inserted
       assert_equal File.new(fixture).read, File.new(trace.trace_name).read
       trace.destroy
       assert_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
@@ -218,7 +228,7 @@ module Api
       assert_equal "New Trace", trace.description
       assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
       assert_equal "public", trace.visibility
-      assert_equal false, trace.inserted
+      assert_not trace.inserted
       assert_equal File.new(fixture).read, File.new(trace.trace_name).read
       trace.destroy
       assert_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v
@@ -237,7 +247,7 @@ module Api
       assert_equal "New Trace", trace.description
       assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
       assert_equal "private", trace.visibility
-      assert_equal false, trace.inserted
+      assert_not trace.inserted
       assert_equal File.new(fixture).read, File.new(trace.trace_name).read
       trace.destroy
       assert_equal "private", second_user.preferences.where(:k => "gps.trace.visibility").first.v
@@ -250,27 +260,27 @@ module Api
       anon_trace_file = create(:trace, :visibility => "private")
 
       # First with no auth
-      put :update, :params => { :id => public_trace_file.id }, :body => public_trace_file.to_xml.to_s
+      put :update, :params => { :id => public_trace_file.id }, :body => create_trace_xml(public_trace_file)
       assert_response :unauthorized
 
       # Now with some other user, which should fail
       basic_authorization create(:user).display_name, "test"
-      put :update, :params => { :id => public_trace_file.id }, :body => public_trace_file.to_xml.to_s
+      put :update, :params => { :id => public_trace_file.id }, :body => create_trace_xml(public_trace_file)
       assert_response :forbidden
 
       # Now with a trace which doesn't exist
       basic_authorization create(:user).display_name, "test"
-      put :update, :params => { :id => 0 }, :body => public_trace_file.to_xml.to_s
+      put :update, :params => { :id => 0 }, :body => create_trace_xml(public_trace_file)
       assert_response :not_found
 
       # Now with a trace which did exist but has been deleted
       basic_authorization deleted_trace_file.user.display_name, "test"
-      put :update, :params => { :id => deleted_trace_file.id }, :body => deleted_trace_file.to_xml.to_s
+      put :update, :params => { :id => deleted_trace_file.id }, :body => create_trace_xml(deleted_trace_file)
       assert_response :not_found
 
       # Now try an update with the wrong ID
       basic_authorization public_trace_file.user.display_name, "test"
-      put :update, :params => { :id => public_trace_file.id }, :body => anon_trace_file.to_xml.to_s
+      put :update, :params => { :id => public_trace_file.id }, :body => create_trace_xml(anon_trace_file)
       assert_response :bad_request,
                       "should not be able to update a trace with a different ID from the XML"
 
@@ -279,7 +289,7 @@ module Api
       t = public_trace_file
       t.description = "Changed description"
       t.visibility = "private"
-      put :update, :params => { :id => t.id }, :body => t.to_xml.to_s
+      put :update, :params => { :id => t.id }, :body => create_trace_xml(t)
       assert_response :success
       nt = Trace.find(t.id)
       assert_equal nt.description, t.description
@@ -292,7 +302,7 @@ module Api
       trace = tracetag.trace
       basic_authorization trace.user.display_name, "test"
 
-      put :update, :params => { :id => trace.id }, :body => trace.to_xml.to_s
+      put :update, :params => { :id => trace.id }, :body => create_trace_xml(trace)
       assert_response :success
 
       updated = Trace.find(trace.id)
@@ -336,8 +346,30 @@ module Api
     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
+
+    ##
+    # build XML for traces
+    # this builds a minimum viable XML for the tests in this suite
+    def create_trace_xml(trace)
+      root = XML::Document.new
+      root.root = XML::Node.new "osm"
+      trc = XML::Node.new "gpx_file"
+      trc["id"] = trace.id.to_s
+      trc["visibility"] = trace.visibility
+      trc["visible"] = trace.visible.to_s
+      desc = XML::Node.new "description"
+      desc << trace.description
+      trc << desc
+      trace.tags.each do |tag|
+        t = XML::Node.new "tag"
+        t << tag.tag
+        trc << t
+      end
+      root.root << trc
+      root.to_s
     end
   end
 end