X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..db3debdd9e5dd09717a7ed144b34158619c85e08:/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 c2ddb6031..0bc5a8d36 100644 --- a/test/controllers/api/traces_controller_test.rb +++ b/test/controllers/api/traces_controller_test.rb @@ -2,29 +2,17 @@ require "test_helper" module Api class TracesControllerTest < ActionDispatch::IntegrationTest - # 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 - 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 - ## # test all routes which lead to this controller def test_routes assert_routing( - { :path => "/api/0.6/gpx/create", :method => :post }, + { :path => "/api/0.6/gpx", :method => :post }, { :controller => "api/traces", :action => "create" } ) + assert_recognizes( + { :controller => "api/traces", :action => "create" }, + { :path => "/api/0.6/gpx/create", :method => :post } + ) assert_routing( { :path => "/api/0.6/gpx/1", :method => :get }, { :controller => "api/traces", :action => "show", :id => "1" } @@ -60,17 +48,18 @@ module Api assert_response :unauthorized # Now with some other user, which should work since the trace is public - auth_header = basic_authorization_header create(:user).display_name, "test" + auth_header = bearer_authorization_header get api_trace_path(public_trace_file), :headers => auth_header assert_response :success # And finally we should be able to do it with the owner of the trace - auth_header = basic_authorization_header public_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header public_trace_file.user get api_trace_path(public_trace_file), :headers => auth_header assert_response :success + assert_select "gpx_file[id='#{public_trace_file.id}'][uid='#{public_trace_file.user.id}']", 1 end - # Check an anoymous trace can't be specifically fetched by another user + # Check an anonymous trace can't be specifically fetched by another user def test_show_anon anon_trace_file = create(:trace, :visibility => "private") @@ -79,12 +68,12 @@ module Api assert_response :unauthorized # Now try with another user, which shouldn't work since the trace is anon - auth_header = basic_authorization_header create(:user).display_name, "test" + auth_header = bearer_authorization_header get api_trace_path(anon_trace_file), :headers => auth_header assert_response :forbidden # And finally we should be able to get the trace details with the trace owner - auth_header = basic_authorization_header anon_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header anon_trace_file.user get api_trace_path(anon_trace_file), :headers => auth_header assert_response :success end @@ -98,12 +87,12 @@ module Api assert_response :unauthorized # Login, and try again - auth_header = basic_authorization_header deleted_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header deleted_trace_file.user get api_trace_path(:id => 0), :headers => auth_header assert_response :not_found # Now try a trace which did exist but has been deleted - auth_header = basic_authorization_header deleted_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header deleted_trace_file.user get api_trace_path(deleted_trace_file), :headers => auth_header assert_response :not_found end @@ -117,13 +106,17 @@ module Api assert_response :unauthorized # Now with some other user, which should work since the trace is public - auth_header = basic_authorization_header create(:user).display_name, "test" + auth_header = bearer_authorization_header get api_trace_data_path(public_trace_file), :headers => auth_header + follow_redirect! + follow_redirect! check_trace_data public_trace_file, "848caa72f2f456d1bd6a0fdf228aa1b9" # And finally we should be able to do it with the owner of the trace - auth_header = basic_authorization_header public_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header public_trace_file.user get api_trace_data_path(public_trace_file), :headers => auth_header + follow_redirect! + follow_redirect! check_trace_data public_trace_file, "848caa72f2f456d1bd6a0fdf228aa1b9" end @@ -132,11 +125,13 @@ module Api identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d") # Authenticate as the owner of the trace we will be using - auth_header = basic_authorization_header identifiable_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header identifiable_trace_file.user # First get the data as is get api_trace_data_path(identifiable_trace_file), :headers => auth_header - check_trace_data identifiable_trace_file, "c6422a3d8750faae49ed70e7e8a51b93", "application/x-gzip", "gpx.gz" + follow_redirect! + follow_redirect! + check_trace_data identifiable_trace_file, "c6422a3d8750faae49ed70e7e8a51b93", "application/gzip", "gpx.gz" # Now ask explicitly for XML format get api_trace_data_path(identifiable_trace_file, :format => "xml"), :headers => auth_header @@ -156,13 +151,15 @@ module Api assert_response :unauthorized # Now with some other user, which shouldn't work since the trace is anon - auth_header = basic_authorization_header create(:user).display_name, "test" + auth_header = bearer_authorization_header get api_trace_data_path(anon_trace_file), :headers => auth_header assert_response :forbidden # And finally we should be able to do it with the owner of the trace - auth_header = basic_authorization_header anon_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header anon_trace_file.user get api_trace_data_path(anon_trace_file), :headers => auth_header + follow_redirect! + follow_redirect! check_trace_data anon_trace_file, "db4cb5ed2d7d2b627b3b504296c4f701" end @@ -175,12 +172,12 @@ module Api assert_response :unauthorized # Login, and try again - auth_header = basic_authorization_header create(:user).display_name, "test" + auth_header = bearer_authorization_header get api_trace_data_path(:id => 0), :headers => auth_header assert_response :not_found # Now try a trace which did exist but has been deleted - auth_header = basic_authorization_header deleted_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header deleted_trace_file.user get api_trace_data_path(deleted_trace_file), :headers => auth_header assert_response :not_found end @@ -193,7 +190,7 @@ module Api user = create(:user) # First with no auth - post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" } + post api_traces_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" } assert_response :unauthorized # Rewind the file @@ -201,27 +198,45 @@ module Api # Now authenticated create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable") - assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v - auth_header = basic_authorization_header user.display_name, "test" - post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }, :headers => auth_header + assert_not_equal "trackable", user.preferences.find_by(:k => "gps.trace.visibility").v + + auth_header = bearer_authorization_header user + + # Create trace and import tracepoints in background job + perform_enqueued_jobs do + post api_traces_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }, :headers => auth_header + end + assert_response :success + trace = Trace.find(response.body.to_i) assert_equal "a.gpx", trace.name assert_equal "New Trace", trace.description assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag) assert_equal "trackable", trace.visibility - assert_not trace.inserted - assert_equal File.new(fixture).read, File.new(trace.trace_name).read + assert trace.inserted + assert_equal File.new(fixture).read, trace.file.blob.download + + # Validate tracepoints + assert_equal 1, trace.points.size + tp = trace.points.first + assert_equal 10000000, tp.latitude + assert_equal 10000000, tp.longitude + assert_equal 3221331576, tp.tile + assert_equal 0, tp.trackid + assert_in_delta(134.0, tp.altitude) + assert_equal DateTime.parse("2008-10-01T10:10:10.000Z"), tp.timestamp + trace.destroy - assert_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v + assert_equal "trackable", user.preferences.find_by(:k => "gps.trace.visibility").v # Rewind the file file.rewind # Now authenticated, with the legacy public flag - assert_not_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v - auth_header = basic_authorization_header user.display_name, "test" - post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 1 }, :headers => auth_header + assert_not_equal "public", user.preferences.find_by(:k => "gps.trace.visibility").v + auth_header = bearer_authorization_header user + post api_traces_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 1 }, :headers => auth_header assert_response :success trace = Trace.find(response.body.to_i) assert_equal "a.gpx", trace.name @@ -229,18 +244,18 @@ module Api assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag) assert_equal "public", trace.visibility assert_not trace.inserted - assert_equal File.new(fixture).read, File.new(trace.trace_name).read + assert_equal File.new(fixture).read, trace.file.blob.download trace.destroy - assert_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v + assert_equal "public", user.preferences.find_by(:k => "gps.trace.visibility").v # Rewind the file file.rewind # Now authenticated, with the legacy private flag second_user = create(:user) - assert_nil second_user.preferences.where(:k => "gps.trace.visibility").first - auth_header = basic_authorization_header second_user.display_name, "test" - post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 0 }, :headers => auth_header + assert_nil second_user.preferences.find_by(:k => "gps.trace.visibility") + auth_header = bearer_authorization_header second_user + post api_traces_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 0 }, :headers => auth_header assert_response :success trace = Trace.find(response.body.to_i) assert_equal "a.gpx", trace.name @@ -248,9 +263,9 @@ module Api assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag) assert_equal "private", trace.visibility assert_not trace.inserted - assert_equal File.new(fixture).read, File.new(trace.trace_name).read + assert_equal File.new(fixture).read, trace.file.blob.download trace.destroy - assert_equal "private", second_user.preferences.where(:k => "gps.trace.visibility").first.v + assert_equal "private", second_user.preferences.find_by(:k => "gps.trace.visibility").v end # Check updating a trace through the api @@ -264,28 +279,28 @@ module Api assert_response :unauthorized # Now with some other user, which should fail - auth_header = basic_authorization_header create(:user).display_name, "test" + auth_header = bearer_authorization_header put api_trace_path(public_trace_file), :params => create_trace_xml(public_trace_file), :headers => auth_header assert_response :forbidden # Now with a trace which doesn't exist - auth_header = basic_authorization_header create(:user).display_name, "test" + auth_header = bearer_authorization_header put api_trace_path(:id => 0), :params => create_trace_xml(public_trace_file), :headers => auth_header assert_response :not_found # Now with a trace which did exist but has been deleted - auth_header = basic_authorization_header deleted_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header deleted_trace_file.user put api_trace_path(deleted_trace_file), :params => create_trace_xml(deleted_trace_file), :headers => auth_header assert_response :not_found # Now try an update with the wrong ID - auth_header = basic_authorization_header public_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header public_trace_file.user put api_trace_path(public_trace_file), :params => create_trace_xml(anon_trace_file), :headers => auth_header assert_response :bad_request, "should not be able to update a trace with a different ID from the XML" # And finally try an update that should work - auth_header = basic_authorization_header public_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header public_trace_file.user t = public_trace_file t.description = "Changed description" t.visibility = "private" @@ -300,7 +315,7 @@ module Api def test_update_tags tracetag = create(:tracetag) trace = tracetag.trace - auth_header = basic_authorization_header trace.user.display_name, "test" + auth_header = bearer_authorization_header trace.user put api_trace_path(trace), :params => create_trace_xml(trace), :headers => auth_header assert_response :success @@ -321,22 +336,22 @@ module Api assert_response :unauthorized # Now with some other user, which should fail - auth_header = basic_authorization_header create(:user).display_name, "test" + auth_header = bearer_authorization_header delete api_trace_path(public_trace_file), :headers => auth_header assert_response :forbidden # Now with a trace which doesn't exist - auth_header = basic_authorization_header create(:user).display_name, "test" + auth_header = bearer_authorization_header delete api_trace_path(:id => 0), :headers => auth_header assert_response :not_found # And finally we should be able to do it with the owner of the trace - auth_header = basic_authorization_header public_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header public_trace_file.user delete api_trace_path(public_trace_file), :headers => auth_header assert_response :success # Try it a second time, which should fail - auth_header = basic_authorization_header public_trace_file.user.display_name, "test" + auth_header = bearer_authorization_header public_trace_file.user delete api_trace_path(public_trace_file), :headers => auth_header assert_response :not_found end