X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5cbaa2fca73316962a8ec8bc591bf6d30d61b211..11aff90f63d79406e9efa1343c965a19dcf5dbba:/test/functional/trace_controller_test.rb

diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index eb8e675b0..812143c81 100644
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -4,7 +4,6 @@ class TraceControllerTest < ActionController::TestCase
   fixtures :users, :gpx_files
   set_fixture_class :gpx_files => 'Trace'
 
-
   # Check that the list of changesets is displayed
   def test_list
     get :list
@@ -39,48 +38,125 @@ class TraceControllerTest < ActionController::TestCase
   end
 
   # Check getting a specific trace through the api
-  def test_api_details
+  def test_api_read
     # First with no auth
-    get :api_details, :id => gpx_files(:public_trace_file).id
+    get :api_read, :id => gpx_files(:public_trace_file).id
     assert_response :unauthorized
 
     # Now with some other user, which should work since the trace is public
     basic_authorization(users(:public_user).display_name, "test")
-    get :api_details, :id => gpx_files(:public_trace_file).id
+    get :api_read, :id => gpx_files(:public_trace_file).id
     assert_response :success
 
     # And finally we should be able to do it with the owner of the trace
     basic_authorization(users(:normal_user).display_name, "test")
-    get :api_details, :id => gpx_files(:public_trace_file).id
+    get :api_read, :id => gpx_files(:public_trace_file).id
     assert_response :success
   end
 
   # Check an anoymous trace can't be specifically fetched by another user
-  def test_api_details_anon
+  def test_api_read_anon
     # Furst with no auth
-    get :api_details, :id => gpx_files(:anon_trace_file).id
+    get :api_read, :id => gpx_files(:anon_trace_file).id
     assert_response :unauthorized
 
     # Now try with another user, which shouldn't work since the trace is anon
     basic_authorization(users(:normal_user).display_name, "test")
-    get :api_details, :id => gpx_files(:anon_trace_file).id
+    get :api_read, :id => gpx_files(:anon_trace_file).id
     assert_response :forbidden
 
     # And finally we should be able to get the trace details with the trace owner
     basic_authorization(users(:public_user).display_name, "test")
-    get :api_details, :id => gpx_files(:anon_trace_file).id
+    get :api_read, :id => gpx_files(:anon_trace_file).id
     assert_response :success
   end
 
   # Check the api details for a trace that doesn't exist
-  def test_api_details_not_found
+  def test_api_read_not_found
     # Try first with no auth, as it should requure it
-    get :api_details, :id => 0
+    get :api_read, :id => 0
     assert_response :unauthorized
 
     # Login, and try again
     basic_authorization(users(:public_user).display_name, "test")
-    get :api_details, :id => 0
+    get :api_read, :id => 0
+    assert_response :not_found
+
+    # Now try a trace which did exist but has been deleted
+    basic_authorization(users(:public_user).display_name, "test")
+    get :api_read, :id => 5
+    assert_response :not_found
+  end
+
+  # Check updating a trace through the api
+  def test_api_update
+    # First with no auth
+    content gpx_files(:public_trace_file).to_xml
+    put :api_update, :id => gpx_files(:public_trace_file).id
+    assert_response :unauthorized
+
+    # Now with some other user, which should fail
+    basic_authorization(users(:public_user).display_name, "test")
+    content gpx_files(:public_trace_file).to_xml
+    put :api_update, :id => gpx_files(:public_trace_file).id
+    assert_response :forbidden
+
+    # Now with a trace which doesn't exist
+    basic_authorization(users(:public_user).display_name, "test")
+    content gpx_files(:public_trace_file).to_xml
+    put :api_update, :id => 0
+    assert_response :not_found
+
+    # Now with a trace which did exist but has been deleted
+    basic_authorization(users(:public_user).display_name, "test")
+    content gpx_files(:deleted_trace_file).to_xml
+    put :api_update, :id => gpx_files(:deleted_trace_file).id
+    assert_response :not_found
+
+    # Now try an update with the wrong ID
+    basic_authorization(users(:normal_user).display_name, "test")
+    content gpx_files(:anon_trace_file).to_xml
+    put :api_update, :id => gpx_files(:public_trace_file).id
+    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
+    basic_authorization(users(:normal_user).display_name, "test")
+    t = gpx_files(:public_trace_file)
+    t.description = "Changed description"
+    t.visibility = "private"
+    content t.to_xml
+    put :api_update, :id => t.id
+    assert_response :success
+    nt = Trace.find(t.id)
+    assert_equal nt.description, t.description
+    assert_equal nt.visibility, t.visibility
+  end
+
+  # Check deleting a trace through the api
+  def test_api_delete
+    # First with no auth
+    delete :api_delete, :id => gpx_files(:public_trace_file).id
+    assert_response :unauthorized
+
+    # Now with some other user, which should fail
+    basic_authorization(users(:public_user).display_name, "test")
+    delete :api_delete, :id => gpx_files(:public_trace_file).id
+    assert_response :forbidden
+
+    # Now with a trace which doesn't exist
+    basic_authorization(users(:public_user).display_name, "test")
+    delete :api_delete, :id => 0
+    assert_response :not_found
+
+    # And finally we should be able to do it with the owner of the trace
+    basic_authorization(users(:normal_user).display_name, "test")
+    delete :api_delete, :id => gpx_files(:public_trace_file).id
+    assert_response :success
+
+    # Try it a second time, which should fail
+    basic_authorization(users(:normal_user).display_name, "test")
+    delete :api_delete, :id => gpx_files(:public_trace_file).id
     assert_response :not_found
   end
 end