Remove inline javascript from id views

[rails.git] / test / controllers / trace_controller_test.rb

diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index 616d25fc2f488dad68909dffde2fd83157d0bb4a..9ef79d1fab0e264dbbe3ae8a5fc3a765831be272 100644 (file)
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -6,13 +6,16 @@ class TraceControllerTest < ActionController::TestCase
 
   def setup
     @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR")
 
   def setup
     @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR")

-    Object.const_set("GPX_TRACE_DIR", File.dirname(__FILE__) + "/../traces")
+    Object.const_set("GPX_TRACE_DIR", Rails.root.join("test", "gpx", "traces"))

 
     @gpx_image_dir = Object.send("remove_const", "GPX_IMAGE_DIR")
 
     @gpx_image_dir = Object.send("remove_const", "GPX_IMAGE_DIR")

-    Object.const_set("GPX_IMAGE_DIR", File.dirname(__FILE__) + "/../traces")
+    Object.const_set("GPX_IMAGE_DIR", Rails.root.join("test", "gpx", "images"))

   end
 
   def teardown
   end
 
   def teardown

+    File.unlink(*Dir.glob(File.join(GPX_TRACE_DIR, "*.gpx")))
+    File.unlink(*Dir.glob(File.join(GPX_IMAGE_DIR, "*.gif")))
+

     Object.send("remove_const", "GPX_TRACE_DIR")
     Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir)
 
     Object.send("remove_const", "GPX_TRACE_DIR")
     Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir)
 


@@ -191,11 +194,11 @@ class TraceControllerTest < ActionController::TestCase
     check_trace_list [trace_a]
 
     # Should see more when we are logged in
     check_trace_list [trace_a]
 
     # Should see more when we are logged in

-    get :list, {}, { :user => users(:public_user).id }
+    get :list, {}, { :user => users(:public_user) }

     check_trace_list [trace_d, trace_c, trace_b, trace_a]
 
     # Again, we should see more when we are logged in
     check_trace_list [trace_d, trace_c, trace_b, trace_a]
 
     # Again, we should see more when we are logged in

-    get :list, { :tag => "London" }, { :user => users(:public_user).id }
+    get :list, { :tag => "London" }, { :user => users(:public_user) }

     check_trace_list [trace_c, trace_a]
   end
 
     check_trace_list [trace_c, trace_a]
   end
 


@@ -213,11 +216,11 @@ class TraceControllerTest < ActionController::TestCase
     assert_redirected_to :controller => "user", :action => "login", :referer => "/traces/mine"
 
     # Now try when logged in
     assert_redirected_to :controller => "user", :action => "login", :referer => "/traces/mine"
 
     # Now try when logged in

-    get :mine, {}, { :user => users(:public_user).id }
+    get :mine, {}, { :user => users(:public_user) }

     assert_redirected_to :controller => "trace", :action => "list", :display_name => users(:public_user).display_name
 
     # Fetch the actual list
     assert_redirected_to :controller => "trace", :action => "list", :display_name => users(:public_user).display_name
 
     # Fetch the actual list

-    get :list, { :display_name => users(:public_user).display_name }, { :user => users(:public_user).id }
+    get :list, { :display_name => users(:public_user).display_name }, { :user => users(:public_user) }

     check_trace_list [trace_b]
   end
 
     check_trace_list [trace_b]
   end
 


@@ -238,15 +241,15 @@ class TraceControllerTest < ActionController::TestCase
     check_trace_list [trace_b]
 
     # Should still see only public ones when authenticated as another user
     check_trace_list [trace_b]
 
     # Should still see only public ones when authenticated as another user

-    get :list, { :display_name => users(:public_user).display_name }, { :user => users(:normal_user).id }
+    get :list, { :display_name => users(:public_user).display_name }, { :user => users(:normal_user) }

     check_trace_list [trace_b]
 
     # Should see all traces when authenticated as the target user
     check_trace_list [trace_b]
 
     # Should see all traces when authenticated as the target user

-    get :list, { :display_name => users(:public_user).display_name }, { :user => users(:public_user).id }
+    get :list, { :display_name => users(:public_user).display_name }, { :user => users(:public_user) }

     check_trace_list [trace_c, trace_b]
 
     # Should only see traces with the correct tag when a tag is specified
     check_trace_list [trace_c, trace_b]
 
     # Should only see traces with the correct tag when a tag is specified

-    get :list, { :display_name => users(:public_user).display_name, :tag => "London" }, { :user => users(:public_user).id }
+    get :list, { :display_name => users(:public_user).display_name, :tag => "London" }, { :user => users(:public_user) }

     check_trace_list [trace_c]
 
     # Should get an error if the user does not exist
     check_trace_list [trace_c]
 
     # Should get an error if the user does not exist


@@ -283,11 +286,11 @@ class TraceControllerTest < ActionController::TestCase
     check_trace_view public_trace_file
 
     # Now with some other user, which should work since the trace is public
     check_trace_view public_trace_file
 
     # Now with some other user, which should work since the trace is public

-    get :view, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id }
+    get :view, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }

     check_trace_view public_trace_file
 
     # And finally we should be able to do it with the owner of the trace
     check_trace_view public_trace_file
 
     # And finally we should be able to do it with the owner of the trace

-    get :view, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id }
+    get :view, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }

     check_trace_view public_trace_file
   end
 
     check_trace_view public_trace_file
   end
 


@@ -301,12 +304,12 @@ class TraceControllerTest < ActionController::TestCase
     assert_redirected_to :action => :list
 
     # Now with some other user, which should not work since the trace is anon
     assert_redirected_to :action => :list
 
     # Now with some other user, which should not work since the trace is anon

-    get :view, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user).id }
+    get :view, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user) }

     assert_response :redirect
     assert_redirected_to :action => :list
 
     # And finally we should be able to do it with the owner of the trace
     assert_response :redirect
     assert_redirected_to :action => :list
 
     # And finally we should be able to do it with the owner of the trace

-    get :view, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user).id }
+    get :view, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user) }

     check_trace_view anon_trace_file
   end
 
     check_trace_view anon_trace_file
   end
 


@@ -320,68 +323,65 @@ class TraceControllerTest < ActionController::TestCase
     assert_redirected_to :action => :list
 
     # Now with some other user
     assert_redirected_to :action => :list
 
     # Now with some other user

-    get :view, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id }
+    get :view, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }

     assert_response :redirect
     assert_redirected_to :action => :list
 
     # And finally we should not be able to view a deleted trace
     assert_response :redirect
     assert_redirected_to :action => :list
 
     # And finally we should not be able to view a deleted trace

-    get :view, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id }
+    get :view, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }

     assert_response :redirect
     assert_redirected_to :action => :list
   end
 
   # Test downloading a trace
   def test_data
     assert_response :redirect
     assert_redirected_to :action => :list
   end
 
   # Test downloading a trace
   def test_data

-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
-      # First with no auth, which should work since the trace is public
-      get :data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
-      check_trace_data public_trace_file
-
-      # Now with some other user, which should work since the trace is public
-      get :data, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id }
-      check_trace_data public_trace_file
-
-      # And finally we should be able to do it with the owner of the trace
-      get :data, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id }
-      check_trace_data public_trace_file
-    end
+    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")
+
+    # First with no auth, which should work since the trace is public
+    get :data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    check_trace_data public_trace_file
+
+    # Now with some other user, which should work since the trace is public
+    get :data, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    check_trace_data public_trace_file
+
+    # And finally we should be able to do it with the owner of the trace
+    get :data, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    check_trace_data public_trace_file

   end
 
   # Test downloading a compressed trace
   def test_data_compressed
   end
 
   # Test downloading a compressed trace
   def test_data_compressed

-    identifiable_trace_file = create(:trace, :visibility => "identifiable")
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/d.gpx" do
-      # First get the data as is
-      get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id
-      check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz"
-
-      # Now ask explicitly for XML format
-      get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "xml"
-      check_trace_data identifiable_trace_file, "application/xml", "xml"
-
-      # Now ask explicitly for GPX format
-      get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "gpx"
-      check_trace_data identifiable_trace_file
-    end
+    identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d")
+
+    # First get the data as is
+    get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id
+    check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz"
+
+    # Now ask explicitly for XML format
+    get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "xml"
+    check_trace_data identifiable_trace_file, "application/xml", "xml"
+
+    # Now ask explicitly for GPX format
+    get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "gpx"
+    check_trace_data identifiable_trace_file

   end
 
   # Check an anonymous trace can't be downloaded by another user
   def test_data_anon
   end
 
   # Check an anonymous trace can't be downloaded by another user
   def test_data_anon

-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/b.gpx" do
-      # First with no auth
-      get :data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
-      assert_response :not_found
-
-      # Now with some other user, which shouldn't work since the trace is anon
-      get :data, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user).id }
-      assert_response :not_found
-
-      # And finally we should be able to do it with the owner of the trace
-      get :data, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user).id }
-      check_trace_data anon_trace_file
-    end
+    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b")
+
+    # First with no auth
+    get :data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    assert_response :not_found
+
+    # Now with some other user, which shouldn't work since the trace is anon
+    get :data, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user) }
+    assert_response :not_found
+
+    # And finally we should be able to do it with the owner of the trace
+    get :data, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user) }
+    check_trace_data anon_trace_file

   end
 
   # Test downloading a trace that doesn't exist
   end
 
   # Test downloading a trace that doesn't exist


@@ -393,48 +393,46 @@ class TraceControllerTest < ActionController::TestCase
     assert_response :not_found
 
     # Now with a trace that has never existed
     assert_response :not_found
 
     # Now with a trace that has never existed

-    get :data, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id }
+    get :data, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }

     assert_response :not_found
 
     # Now with a trace that has been deleted
     assert_response :not_found
 
     # Now with a trace that has been deleted

-    get :data, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id }
+    get :data, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }

     assert_response :not_found
   end
 
   # Test downloading the picture for a trace
   def test_picture
     assert_response :not_found
   end
 
   # Test downloading the picture for a trace
   def test_picture

-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/a.gif" do
-      # First with no auth, which should work since the trace is public
-      get :picture, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
-      check_trace_picture public_trace_file
-
-      # Now with some other user, which should work since the trace is public
-      get :picture, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id }
-      check_trace_picture public_trace_file
-
-      # And finally we should be able to do it with the owner of the trace
-      get :picture, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id }
-      check_trace_picture public_trace_file
-    end
+    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")
+
+    # First with no auth, which should work since the trace is public
+    get :picture, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    check_trace_picture public_trace_file
+
+    # Now with some other user, which should work since the trace is public
+    get :picture, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    check_trace_picture public_trace_file
+
+    # And finally we should be able to do it with the owner of the trace
+    get :picture, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    check_trace_picture public_trace_file

   end
 
   # Check the picture for an anonymous trace can't be downloaded by another user
   def test_picture_anon
   end
 
   # Check the picture for an anonymous trace can't be downloaded by another user
   def test_picture_anon

-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/b.gif" do
-      # First with no auth
-      get :picture, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
-      assert_response :forbidden
-
-      # Now with some other user, which shouldn't work since the trace is anon
-      get :picture, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user).id }
-      assert_response :forbidden
-
-      # And finally we should be able to do it with the owner of the trace
-      get :picture, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user).id }
-      check_trace_picture anon_trace_file
-    end
+    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b")
+
+    # First with no auth
+    get :picture, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    assert_response :forbidden
+
+    # Now with some other user, which shouldn't work since the trace is anon
+    get :picture, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user) }
+    assert_response :forbidden
+
+    # And finally we should be able to do it with the owner of the trace
+    get :picture, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user) }
+    check_trace_picture anon_trace_file

   end
 
   # Test downloading the picture for a trace that doesn't exist
   end
 
   # Test downloading the picture for a trace that doesn't exist


@@ -444,49 +442,47 @@ class TraceControllerTest < ActionController::TestCase
     assert_response :not_found
 
     # Now with some other user, which should work since the trace is public
     assert_response :not_found
 
     # Now with some other user, which should work since the trace is public

-    get :picture, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id }
+    get :picture, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }

     assert_response :not_found
 
     # And finally we should not be able to do it with a deleted trace
     deleted_trace_file = create(:trace, :deleted)
     assert_response :not_found
 
     # And finally we should not be able to do it with a deleted trace
     deleted_trace_file = create(:trace, :deleted)

-    get :picture, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id }
+    get :picture, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }

     assert_response :not_found
   end
 
   # Test downloading the icon for a trace
   def test_icon
     assert_response :not_found
   end
 
   # Test downloading the icon for a trace
   def test_icon

-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/a_icon.gif" do
-      # First with no auth, which should work since the trace is public
-      get :icon, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
-      check_trace_icon public_trace_file
-
-      # Now with some other user, which should work since the trace is public
-      get :icon, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id }
-      check_trace_icon public_trace_file
-
-      # And finally we should be able to do it with the owner of the trace
-      get :icon, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id }
-      check_trace_icon public_trace_file
-    end
+    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")
+
+    # First with no auth, which should work since the trace is public
+    get :icon, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    check_trace_icon public_trace_file
+
+    # Now with some other user, which should work since the trace is public
+    get :icon, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    check_trace_icon public_trace_file
+
+    # And finally we should be able to do it with the owner of the trace
+    get :icon, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    check_trace_icon public_trace_file

   end
 
   # Check the icon for an anonymous trace can't be downloaded by another user
   def test_icon_anon
   end
 
   # Check the icon for an anonymous trace can't be downloaded by another user
   def test_icon_anon

-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/b_icon.gif" do
-      # First with no auth
-      get :icon, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
-      assert_response :forbidden
-
-      # Now with some other user, which shouldn't work since the trace is anon
-      get :icon, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user).id }
-      assert_response :forbidden
-
-      # And finally we should be able to do it with the owner of the trace
-      get :icon, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user).id }
-      check_trace_icon anon_trace_file
-    end
+    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b")
+
+    # First with no auth
+    get :icon, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    assert_response :forbidden
+
+    # Now with some other user, which shouldn't work since the trace is anon
+    get :icon, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user) }
+    assert_response :forbidden
+
+    # And finally we should be able to do it with the owner of the trace
+    get :icon, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user) }
+    check_trace_icon anon_trace_file

   end
 
   # Test downloading the icon for a trace that doesn't exist
   end
 
   # Test downloading the icon for a trace that doesn't exist


@@ -496,12 +492,12 @@ class TraceControllerTest < ActionController::TestCase
     assert_response :not_found
 
     # Now with some other user
     assert_response :not_found
 
     # Now with some other user

-    get :icon, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id }
+    get :icon, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }

     assert_response :not_found
 
     # And finally we should not be able to do it with a deleted trace
     deleted_trace_file = create(:trace, :deleted)
     assert_response :not_found
 
     # And finally we should not be able to do it with a deleted trace
     deleted_trace_file = create(:trace, :deleted)

-    get :icon, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id }
+    get :icon, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -514,20 +510,20 @@ class TraceControllerTest < ActionController::TestCase
 
     # Now authenticated as a user with gps.trace.visibility set
     create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable")
 
     # Now authenticated as a user with gps.trace.visibility set
     create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable")

-    get :create, {}, { :user => users(:public_user).id }
+    get :create, {}, { :user => users(:public_user) }

     assert_response :success
     assert_template :create
     assert_select "select#trace_visibility option[value=identifiable][selected]", 1
 
     # Now authenticated as a user with gps.trace.public set
     create(:user_preference, :user => users(:second_public_user), :k => "gps.trace.public", :v => "default")
     assert_response :success
     assert_template :create
     assert_select "select#trace_visibility option[value=identifiable][selected]", 1
 
     # Now authenticated as a user with gps.trace.public set
     create(:user_preference, :user => users(:second_public_user), :k => "gps.trace.public", :v => "default")

-    get :create, {}, { :user => users(:second_public_user).id }
+    get :create, {}, { :user => users(:second_public_user) }

     assert_response :success
     assert_template :create
     assert_select "select#trace_visibility option[value=public][selected]", 1
 
     # Now authenticated as a user with no preferences
     assert_response :success
     assert_template :create
     assert_select "select#trace_visibility option[value=public][selected]", 1
 
     # Now authenticated as a user with no preferences

-    get :create, {}, { :user => users(:normal_user).id }
+    get :create, {}, { :user => users(:normal_user) }

     assert_response :success
     assert_template :create
     assert_select "select#trace_visibility option[value=private][selected]", 1
     assert_response :success
     assert_template :create
     assert_select "select#trace_visibility option[value=private][selected]", 1


@@ -535,35 +531,33 @@ class TraceControllerTest < ActionController::TestCase
 
   # Test creating a trace
   def test_create_post
 
   # Test creating a trace
   def test_create_post

-    public_trace_file = create(:trace, :visibility => "public")
-    public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
-      # Get file to use
-      file = Rack::Test::UploadedFile.new(public_trace_file.trace_name, "application/gpx+xml")
-
-      # First with no auth
-      post :create, :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" }
-      assert_response :forbidden
-
-      # Now authenticated
-      create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable")
-      assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
-      post :create, { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, { :user => users(:public_user).id }
-      assert_response :redirect
-      assert_redirected_to :action => :list, :display_name => users(:public_user).display_name
-      assert_match /file has been uploaded/, flash[:notice]
-      trace = Trace.order(:id => :desc).first
-      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(public_trace_file.trace_name).read, File.new(trace.trace_name).read
-      trace.destroy
-      assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
-    end
+    # Get file to use
+    fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx")
+    file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml")
+
+    # First with no auth
+    post :create, :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" }
+    assert_response :forbidden
+
+    # Now authenticated
+    create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable")
+    assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
+    post :create, { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, { :user => users(:public_user) }
+    assert_response :redirect
+    assert_redirected_to :action => :list, :display_name => users(:public_user).display_name
+    assert_match /file has been uploaded/, flash[:notice]
+    trace = Trace.order(:id => :desc).first
+    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
+    trace.destroy
+    assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v

   end
 
   end
 

-  # Test fetching the edit page for a trace
+  # Test fetching the edit page for a trace using GET

   def test_edit_get
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
     deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
   def test_edit_get
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
     deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))


@@ -574,26 +568,53 @@ class TraceControllerTest < ActionController::TestCase
     assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => users(:normal_user).display_name, :id => public_trace_file.id)
 
     # Now with some other user, which should fail
     assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => users(:normal_user).display_name, :id => public_trace_file.id)
 
     # Now with some other user, which should fail

-    get :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id }
+    get :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    assert_response :forbidden
+
+    # Now with a trace which doesn't exist
+    get :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }
+    assert_response :not_found
+
+    # Now with a trace which has been deleted
+    get :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }
+    assert_response :not_found
+
+    # Finally with a trace that we are allowed to edit
+    get :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    assert_response :success
+  end
+
+  # Test fetching the edit page for a trace using POST
+  def test_edit_post_no_details
+    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
+    deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
+
+    # First with no auth
+    post :edit, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    assert_response :forbidden
+
+    # Now with some other user, which should fail
+    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }

     assert_response :forbidden
 
     # Now with a trace which doesn't exist
     assert_response :forbidden
 
     # Now with a trace which doesn't exist

-    get :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id }
+    post :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }

     assert_response :not_found
 
     # Now with a trace which has been deleted
     assert_response :not_found
 
     # Now with a trace which has been deleted

-    get :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id }
+    post :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }

     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit
     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit

-    get :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id }
+    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }

     assert_response :success
   end
 
   # Test saving edits to a trace
     assert_response :success
   end
 
   # Test saving edits to a trace

-  def test_edit_post
+  def test_edit_post_with_details

     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
     deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
     deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))

+

     # New details
     new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" }
 
     # New details
     new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" }
 


@@ -602,19 +623,19 @@ class TraceControllerTest < ActionController::TestCase
     assert_response :forbidden
 
     # Now with some other user, which should fail
     assert_response :forbidden
 
     # Now with some other user, which should fail

-    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details }, { :user => users(:public_user).id }
+    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details }, { :user => users(:public_user) }

     assert_response :forbidden
 
     # Now with a trace which doesn't exist
     assert_response :forbidden
 
     # Now with a trace which doesn't exist

-    post :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id, :trace => new_details }
+    post :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user), :trace => new_details }

     assert_response :not_found
 
     # Now with a trace which has been deleted
     assert_response :not_found
 
     # Now with a trace which has been deleted

-    post :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id, :trace => new_details }, { :user => users(:public_user).id }
+    post :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id, :trace => new_details }, { :user => users(:public_user) }

     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit
     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit

-    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details }, { :user => users(:normal_user).id }
+    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details }, { :user => users(:normal_user) }

     assert_response :redirect
     assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
     trace = Trace.find(public_trace_file.id)
     assert_response :redirect
     assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
     trace = Trace.find(public_trace_file.id)


@@ -633,19 +654,19 @@ class TraceControllerTest < ActionController::TestCase
     assert_response :forbidden
 
     # Now with some other user, which should fail
     assert_response :forbidden
 
     # Now with some other user, which should fail

-    post :delete, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id }
+    post :delete, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }

     assert_response :forbidden
 
     # Now with a trace which doesn't exist
     assert_response :forbidden
 
     # Now with a trace which doesn't exist

-    post :delete, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id }
+    post :delete, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }

     assert_response :not_found
 
     # Now with a trace has already been deleted
     assert_response :not_found
 
     # Now with a trace has already been deleted

-    post :delete, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id }
+    post :delete, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }

     assert_response :not_found
 
     # Finally with a trace that we are allowed to delete
     assert_response :not_found
 
     # Finally with a trace that we are allowed to delete

-    post :delete, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id }
+    post :delete, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }

     assert_response :redirect
     assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name
     trace = Trace.find(public_trace_file.id)
     assert_response :redirect
     assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name
     trace = Trace.find(public_trace_file.id)


@@ -711,63 +732,60 @@ class TraceControllerTest < ActionController::TestCase
 
   # Test downloading a trace through the api
   def test_api_data
 
   # Test downloading a trace through the api
   def test_api_data

-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
-      # First with no auth
-      get :api_data, :display_name => users(:normal_user).display_name, :id => 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_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
-      check_trace_data public_trace_file
-
-      # 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_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
-      check_trace_data public_trace_file
-    end
+    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")
+
+    # First with no auth
+    get :api_data, :display_name => users(:normal_user).display_name, :id => 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_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    check_trace_data public_trace_file
+
+    # 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_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    check_trace_data public_trace_file

   end
 
   # Test downloading a compressed trace through the api
   def test_api_data_compressed
   end
 
   # Test downloading a compressed trace through the api
   def test_api_data_compressed

-    identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => users(:public_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/d.gpx" do
-      # Authenticate as the owner of the trace we will be using
-      basic_authorization(users(:public_user).display_name, "test")
-
-      # First get the data as is
-      get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id
-      check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz"
-
-      # Now ask explicitly for XML format
-      get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "xml"
-      check_trace_data identifiable_trace_file, "application/xml", "xml"
-
-      # Now ask explicitly for GPX format
-      get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "gpx"
-      check_trace_data identifiable_trace_file
-    end
+    identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => users(:public_user), :fixture => "d")
+
+    # Authenticate as the owner of the trace we will be using
+    basic_authorization(users(:public_user).display_name, "test")
+
+    # First get the data as is
+    get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id
+    check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz"
+
+    # Now ask explicitly for XML format
+    get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "xml"
+    check_trace_data identifiable_trace_file, "application/xml", "xml"
+
+    # Now ask explicitly for GPX format
+    get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "gpx"
+    check_trace_data identifiable_trace_file

   end
 
   # Check an anonymous trace can't be downloaded by another user through the api
   def test_api_data_anon
   end
 
   # Check an anonymous trace can't be downloaded by another user through the api
   def test_api_data_anon

-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/b.gpx" do
-      # First with no auth
-      get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
-      assert_response :unauthorized
-
-      # Now with some other user, which shouldn't work since the trace is anon
-      basic_authorization(users(:normal_user).display_name, "test")
-      get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
-      assert_response :forbidden
-
-      # And finally we should be able to do it with the owner of the trace
-      basic_authorization(users(:public_user).display_name, "test")
-      get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
-      check_trace_data anon_trace_file
-    end
+    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b")
+
+    # First with no auth
+    get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    assert_response :unauthorized
+
+    # Now with some other user, which shouldn't work since the trace is anon
+    basic_authorization(users(:normal_user).display_name, "test")
+    get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    assert_response :forbidden
+
+    # And finally we should be able to do it with the owner of the trace
+    basic_authorization(users(:public_user).display_name, "test")
+    get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    check_trace_data anon_trace_file

   end
 
   # Test downloading a trace that doesn't exist through the api
   end
 
   # Test downloading a trace that doesn't exist through the api


@@ -790,118 +808,114 @@ class TraceControllerTest < ActionController::TestCase
 
   # Test creating a trace through the api
   def test_api_create
 
   # Test creating a trace through the api
   def test_api_create

-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
-      # Get file to use
-      file = Rack::Test::UploadedFile.new(public_trace_file.trace_name, "application/gpx+xml")
-
-      # First with no auth
-      post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable"
-      assert_response :unauthorized
-
-      # Now authenticated
-      create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable")
-      assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
-      basic_authorization(users(:public_user).display_name, "test")
-      post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable"
-      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(public_trace_file.trace_name).read, File.new(trace.trace_name).read
-      trace.destroy
-      assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
-
-      # Rewind the file
-      file.rewind
-
-      # Now authenticated, with the legacy public flag
-      assert_not_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
-      basic_authorization(users(:public_user).display_name, "test")
-      post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 1
-      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(public_trace_file.trace_name).read, File.new(trace.trace_name).read
-      trace.destroy
-      assert_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
-
-      # Rewind the file
-      file.rewind
-
-      # Now authenticated, with the legacy private flag
-      assert_nil users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first
-      basic_authorization(users(:second_public_user).display_name, "test")
-      post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 0
-      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(public_trace_file.trace_name).read, File.new(trace.trace_name).read
-      trace.destroy
-      assert_equal "private", users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first.v
-    end
+    # Get file to use
+    fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx")
+    file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml")
+
+    # First with no auth
+    post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable"
+    assert_response :unauthorized
+
+    # Now authenticated
+    create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable")
+    assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
+    basic_authorization(users(:public_user).display_name, "test")
+    post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable"
+    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
+    trace.destroy
+    assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
+
+    # Rewind the file
+    file.rewind
+
+    # Now authenticated, with the legacy public flag
+    assert_not_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
+    basic_authorization(users(:public_user).display_name, "test")
+    post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 1
+    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
+    trace.destroy
+    assert_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
+
+    # Rewind the file
+    file.rewind
+
+    # Now authenticated, with the legacy private flag
+    assert_nil users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first
+    basic_authorization(users(:second_public_user).display_name, "test")
+    post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 0
+    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
+    trace.destroy
+    assert_equal "private", users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first.v

   end
 
   # Check updating a trace through the api
   def test_api_update
   end
 
   # Check updating a trace through the api
   def test_api_update

-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
+    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")

     deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
     anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
 
     deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
     anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
 

-    public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
-      # First with no auth
-      content public_trace_file.to_xml
-      put :api_update, :id => public_trace_file.id
-      assert_response :unauthorized
-
-      # Now with some other user, which should fail
-      basic_authorization(users(:public_user).display_name, "test")
-      content public_trace_file.to_xml
-      put :api_update, :id => public_trace_file.id
-      assert_response :forbidden
-
-      # Now with a trace which doesn't exist
-      basic_authorization(users(:public_user).display_name, "test")
-      content 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 deleted_trace_file.to_xml
-      put :api_update, :id => 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 anon_trace_file.to_xml
-      put :api_update, :id => 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 = 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
+    # First with no auth
+    content public_trace_file.to_xml
+    put :api_update, :id => public_trace_file.id
+    assert_response :unauthorized
+
+    # Now with some other user, which should fail
+    basic_authorization(users(:public_user).display_name, "test")
+    content public_trace_file.to_xml
+    put :api_update, :id => public_trace_file.id
+    assert_response :forbidden
+
+    # Now with a trace which doesn't exist
+    basic_authorization(users(:public_user).display_name, "test")
+    content 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 deleted_trace_file.to_xml
+    put :api_update, :id => 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 anon_trace_file.to_xml
+    put :api_update, :id => 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 = 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
   end
 
   # Check deleting a trace through the api