- class TracesControllerTest < ActionController::TestCase
- def teardown
- File.unlink(*Dir.glob(File.join(Settings.gpx_trace_dir, "*.gpx")))
- File.unlink(*Dir.glob(File.join(Settings.gpx_image_dir, "*.gif")))
- end
-
+ class TracesControllerTest < ActionDispatch::IntegrationTest
assert_response :unauthorized
# Now with some other user, which should work since the trace is public
assert_response :unauthorized
# Now with some other user, which should work since the trace is public
- basic_authorization create(:user).display_name, "test"
- get :show, :params => { :id => public_trace_file.id }
+ auth_header = bearer_authorization_header
+ get api_trace_path(public_trace_file), :headers => auth_header
- basic_authorization public_trace_file.user.display_name, "test"
- get :show, :params => { :id => public_trace_file.id }
+ auth_header = bearer_authorization_header public_trace_file.user
+ get api_trace_path(public_trace_file), :headers => auth_header
assert_response :unauthorized
# Now try with another user, which shouldn't work since the trace is anon
assert_response :unauthorized
# Now try with another user, which shouldn't work since the trace is anon
- basic_authorization create(:user).display_name, "test"
- get :show, :params => { :id => anon_trace_file.id }
+ 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
assert_response :forbidden
# And finally we should be able to get the trace details with the trace owner
- basic_authorization anon_trace_file.user.display_name, "test"
- get :show, :params => { :id => anon_trace_file.id }
+ auth_header = bearer_authorization_header anon_trace_file.user
+ get api_trace_path(anon_trace_file), :headers => auth_header
deleted_trace_file = create(:trace, :deleted)
# Try first with no auth, as it should require it
deleted_trace_file = create(:trace, :deleted)
# Try first with no auth, as it should require it
- basic_authorization deleted_trace_file.user.display_name, "test"
- get :show, :params => { :id => 0 }
+ auth_header = bearer_authorization_header deleted_trace_file.user
+ get api_trace_path(:id => 0), :headers => auth_header
- basic_authorization deleted_trace_file.user.display_name, "test"
- get :show, :params => { :id => deleted_trace_file.id }
+ auth_header = bearer_authorization_header deleted_trace_file.user
+ get api_trace_path(deleted_trace_file), :headers => auth_header
assert_response :unauthorized
# Now with some other user, which should work since the trace is public
assert_response :unauthorized
# Now with some other user, which should work since the trace is public
- basic_authorization create(:user).display_name, "test"
- get :data, :params => { :id => public_trace_file.id }
+ 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
check_trace_data public_trace_file, "848caa72f2f456d1bd6a0fdf228aa1b9"
# And finally we should be able to do it with the owner of the trace
- basic_authorization public_trace_file.user.display_name, "test"
- get :data, :params => { :id => public_trace_file.id }
+ auth_header = bearer_authorization_header public_trace_file.user
+ get api_trace_data_path(public_trace_file), :headers => auth_header
+ follow_redirect!
+ follow_redirect!
identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d")
# Authenticate as the owner of the trace we will be using
identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d")
# Authenticate as the owner of the trace we will be using
- get :data, :params => { :id => identifiable_trace_file.id }
- check_trace_data identifiable_trace_file, "c6422a3d8750faae49ed70e7e8a51b93", "application/x-gzip", "gpx.gz"
+ get api_trace_data_path(identifiable_trace_file), :headers => auth_header
+ follow_redirect!
+ follow_redirect!
+ check_trace_data identifiable_trace_file, "c6422a3d8750faae49ed70e7e8a51b93", "application/gzip", "gpx.gz"
check_trace_data identifiable_trace_file, "abd6675fdf3024a84fc0a1deac147c0d", "application/xml", "xml"
# Now ask explicitly for GPX format
check_trace_data identifiable_trace_file, "abd6675fdf3024a84fc0a1deac147c0d", "application/xml", "xml"
# Now ask explicitly for GPX format
assert_response :unauthorized
# Now with some other user, which shouldn't work since the trace is anon
assert_response :unauthorized
# Now with some other user, which shouldn't work since the trace is anon
- basic_authorization create(:user).display_name, "test"
- get :data, :params => { :id => anon_trace_file.id }
+ auth_header = bearer_authorization_header
+ get api_trace_data_path(anon_trace_file), :headers => auth_header
- basic_authorization anon_trace_file.user.display_name, "test"
- get :data, :params => { :id => anon_trace_file.id }
+ auth_header = bearer_authorization_header anon_trace_file.user
+ get api_trace_data_path(anon_trace_file), :headers => auth_header
+ follow_redirect!
+ follow_redirect!
deleted_trace_file = create(:trace, :deleted)
# Try first with no auth, as it should require it
deleted_trace_file = create(:trace, :deleted)
# Try first with no auth, as it should require it
- basic_authorization create(:user).display_name, "test"
- get :data, :params => { :id => 0 }
+ auth_header = bearer_authorization_header
+ get api_trace_data_path(:id => 0), :headers => auth_header
- basic_authorization deleted_trace_file.user.display_name, "test"
- get :data, :params => { :id => deleted_trace_file.id }
+ auth_header = bearer_authorization_header deleted_trace_file.user
+ get api_trace_data_path(deleted_trace_file), :headers => auth_header
- post :create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }
+ post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }
# Now authenticated
create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
# 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
- basic_authorization user.display_name, "test"
- post :create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }
+ assert_not_equal "trackable", user.preferences.find_by(:k => "gps.trace.visibility").v
+ auth_header = bearer_authorization_header user
+ post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }, :headers => auth_header
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_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_equal false, trace.inserted
- assert_equal File.new(fixture).read, File.new(trace.trace_name).read
+ assert_not trace.inserted
+ assert_equal File.new(fixture).read, trace.file.blob.download
- assert_not_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v
- basic_authorization user.display_name, "test"
- post :create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 1 }
+ assert_not_equal "public", user.preferences.find_by(:k => "gps.trace.visibility").v
+ auth_header = bearer_authorization_header user
+ post gpx_create_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
assert_equal "New Trace", trace.description
assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
assert_equal "public", trace.visibility
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 "public", trace.visibility
- assert_equal false, trace.inserted
- assert_equal File.new(fixture).read, File.new(trace.trace_name).read
+ assert_not trace.inserted
+ assert_equal File.new(fixture).read, trace.file.blob.download
# Rewind the file
file.rewind
# Now authenticated, with the legacy private flag
second_user = create(:user)
# 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
- basic_authorization second_user.display_name, "test"
- post :create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 0 }
+ assert_nil second_user.preferences.find_by(:k => "gps.trace.visibility")
+ auth_header = bearer_authorization_header second_user
+ post gpx_create_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
assert_equal "New Trace", trace.description
assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
assert_equal "private", trace.visibility
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 "private", trace.visibility
- assert_equal false, trace.inserted
- assert_equal File.new(fixture).read, File.new(trace.trace_name).read
+ assert_not trace.inserted
+ assert_equal File.new(fixture).read, trace.file.blob.download
assert_response :unauthorized
# Now with some other user, which should fail
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 => create_trace_xml(public_trace_file)
+ auth_header = bearer_authorization_header
+ put api_trace_path(public_trace_file), :params => create_trace_xml(public_trace_file), :headers => auth_header
- basic_authorization create(:user).display_name, "test"
- put :update, :params => { :id => 0 }, :body => create_trace_xml(public_trace_file)
+ auth_header = bearer_authorization_header
+ put api_trace_path(:id => 0), :params => create_trace_xml(public_trace_file), :headers => auth_header
- basic_authorization deleted_trace_file.user.display_name, "test"
- put :update, :params => { :id => deleted_trace_file.id }, :body => create_trace_xml(deleted_trace_file)
+ 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
- basic_authorization public_trace_file.user.display_name, "test"
- put :update, :params => { :id => public_trace_file.id }, :body => create_trace_xml(anon_trace_file)
+ 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
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
# The new tag object might have a different id, so check the string representation
assert_equal trace.tagstring, updated.tagstring
end
# The new tag object might have a different id, so check the string representation
assert_equal trace.tagstring, updated.tagstring
end
assert_response :unauthorized
# Now with some other user, which should fail
assert_response :unauthorized
# Now with some other user, which should fail
- basic_authorization create(:user).display_name, "test"
- delete :destroy, :params => { :id => public_trace_file.id }
+ auth_header = bearer_authorization_header
+ delete api_trace_path(public_trace_file), :headers => auth_header
- basic_authorization create(:user).display_name, "test"
- delete :destroy, :params => { :id => 0 }
+ auth_header = bearer_authorization_header
+ delete api_trace_path(:id => 0), :headers => auth_header
- basic_authorization public_trace_file.user.display_name, "test"
- delete :destroy, :params => { :id => public_trace_file.id }
+ auth_header = bearer_authorization_header public_trace_file.user
+ delete api_trace_path(public_trace_file), :headers => auth_header
- basic_authorization public_trace_file.user.display_name, "test"
- delete :destroy, :params => { :id => public_trace_file.id }
+ auth_header = bearer_authorization_header public_trace_file.user
+ delete api_trace_path(public_trace_file), :headers => auth_header
def check_trace_data(trace, digest, content_type = "application/gpx+xml", extension = "gpx")
assert_response :success
assert_equal digest, Digest::MD5.hexdigest(response.body)
def check_trace_data(trace, digest, content_type = "application/gpx+xml", extension = "gpx")
assert_response :success
assert_equal digest, Digest::MD5.hexdigest(response.body)