X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f2d13c075660efb9582d7fb600bd6798d7a382ca..dbd88d893f3c3fce9cafd666b94396988646d81f:/test/controllers/trace_controller_test.rb

diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index 01c81a1aa..e53809840 100644
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -1,17 +1,24 @@
-require 'test_helper'
+require "test_helper"
+require "minitest/mock"
 
 class TraceControllerTest < ActionController::TestCase
-  fixtures :users, :gpx_files
-  set_fixture_class :gpx_files => 'Trace'
-
   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")
+    Object.const_set("GPX_IMAGE_DIR", Rails.root.join("test", "gpx", "images"))
   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_IMAGE_DIR")
+    Object.const_set("GPX_IMAGE_DIR", @gpx_image_dir)
   end
 
   ##
@@ -150,238 +157,498 @@ class TraceControllerTest < ActionController::TestCase
       { :path => "/trace/1/edit", :method => :post },
       { :controller => "trace", :action => "edit", :id => "1" }
     )
-    assert_routing(
-      { :path => "/trace/1/edit", :method => :patch },
-      { :controller => "trace", :action => "edit", :id => "1" }
-    )
     assert_routing(
       { :path => "/trace/1/delete", :method => :post },
       { :controller => "trace", :action => "delete", :id => "1" }
     )
   end
 
-  # Check that the list of changesets is displayed
+  # Check that the list of traces is displayed
   def test_list
+    user = create(:user)
+    # The fourth test below is surpisingly sensitive to timestamp ordering when the timestamps are equal.
+    trace_a = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago) do |trace|
+      create(:tracetag, :trace => trace, :tag => "London")
+    end
+    trace_b = create(:trace, :visibility => "public", :timestamp => 3.seconds.ago) do |trace|
+      create(:tracetag, :trace => trace, :tag => "Birmingham")
+    end
+    trace_c = create(:trace, :visibility => "private", :user => user, :timestamp => 2.seconds.ago) do |trace|
+      create(:tracetag, :trace => trace, :tag => "London")
+    end
+    trace_d = create(:trace, :visibility => "private", :user => user, :timestamp => 1.second.ago) do |trace|
+      create(:tracetag, :trace => trace, :tag => "Birmingham")
+    end
+
+    # First with the public list
     get :list
-    check_trace_list Trace.public
+    check_trace_list [trace_b, trace_a]
 
-    get :list, :tag => "London"
-    check_trace_list Trace.tagged("London").public
+    # Restrict traces to those with a given tag
+    get :list, :params => { :tag => "London" }
+    check_trace_list [trace_a]
+
+    # Should see more when we are logged in
+    get :list, :session => { :user => user }
+    check_trace_list [trace_d, trace_c, trace_b, trace_a]
+
+    # Again, we should see more when we are logged in
+    get :list, :params => { :tag => "London" }, :session => { :user => user }
+    check_trace_list [trace_c, trace_a]
   end
 
   # Check that I can get mine
   def test_list_mine
+    user = create(:user)
+    create(:trace, :visibility => "public") do |trace|
+      create(:tracetag, :trace => trace, :tag => "Birmingham")
+    end
+    trace_b = create(:trace, :visibility => "private", :user => user) do |trace|
+      create(:tracetag, :trace => trace, :tag => "London")
+    end
+
     # First try to get it when not logged in
     get :mine
-    assert_redirected_to :controller => 'user', :action => 'login', :referer => '/traces/mine'
+    assert_redirected_to :controller => "user", :action => "login", :referer => "/traces/mine"
 
     # Now try when logged in
-    get :mine, {}, {:user => users(:public_user).id}
-    assert_redirected_to :controller => 'trace', :action => 'list', :display_name => users(:public_user).display_name
+    get :mine, :session => { :user => user }
+    assert_redirected_to :controller => "trace", :action => "list", :display_name => user.display_name
 
     # Fetch the actual list
-    get :list, {:display_name => users(:public_user).display_name}, {:user => users(:public_user).id}
-    check_trace_list users(:public_user).traces
+    get :list, :params => { :display_name => user.display_name }, :session => { :user => user }
+    check_trace_list [trace_b]
   end
 
-  # Check the list of changesets for a specific user
+  # Check the list of traces for a specific user
   def test_list_user
+    user = create(:user)
+    second_user = create(:user)
+    third_user = create(:user)
+    create(:trace)
+    trace_b = create(:trace, :visibility => "public", :user => user)
+    trace_c = create(:trace, :visibility => "private", :user => user) do |trace|
+      create(:tracetag, :trace => trace, :tag => "London")
+    end
+
     # Test a user with no traces
-    get :list, :display_name => users(:second_public_user).display_name
-    check_trace_list users(:second_public_user).traces.public
+    get :list, :params => { :display_name => second_user.display_name }
+    check_trace_list []
 
-    # Test a user with some traces - should see only public ones
-    get :list, :display_name => users(:public_user).display_name
-    check_trace_list users(:public_user).traces.public
+    # Test the user with the traces - should see only public ones
+    get :list, :params => { :display_name => user.display_name }
+    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}
-    check_trace_list users(:public_user).traces.public
+    get :list, :params => { :display_name => user.display_name }, :session => { :user => third_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}
-    check_trace_list users(:public_user).traces
+    get :list, :params => { :display_name => user.display_name }, :session => { :user => user }
+    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}
-    check_trace_list users(:public_user).traces.tagged("London")
+    get :list, :params => { :display_name => user.display_name, :tag => "London" }, :session => { :user => user }
+    check_trace_list [trace_c]
+
+    # Should get an error if the user does not exist
+    get :list, :params => { :display_name => "UnknownUser" }
+    assert_response :not_found
+    assert_template "user/no_such_user"
+  end
+
+  # Check a multi-page list
+  def test_list_paged
+    # Create several pages worth of traces
+    create_list(:trace, 50)
+
+    # Try and get the list
+    get :list
+    assert_response :success
+    assert_select "table#trace_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
+    end
+
+    # Try and get the second page
+    get :list, :params => { :page => 2 }
+    assert_response :success
+    assert_select "table#trace_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
+    end
   end
 
   # Check that the rss loads
   def test_rss
-    get :georss, :format => :rss
-    check_trace_feed Trace.public
+    user = create(:user)
+
+    # First with the public feed
+    get :georss, :params => { :format => :rss }
+    check_trace_feed Trace.visible_to_all
 
-    get :georss, :tag => "London", :format => :rss
-    check_trace_feed Trace.tagged("London").public
+    # Restrict traces to those with a given tag
+    get :georss, :params => { :tag => "London", :format => :rss }
+    check_trace_feed Trace.tagged("London").visible_to_all
 
-    get :georss, :display_name => users(:public_user).display_name, :format => :rss
-    check_trace_feed users(:public_user).traces.public
+    # Restrict traces to those for a given user
+    get :georss, :params => { :display_name => user.display_name, :format => :rss }
+    check_trace_feed user.traces.visible_to_all
 
-    get :georss, :display_name => users(:public_user).display_name, :tag => "Birmingham", :format => :rss
-    check_trace_feed users(:public_user).traces.tagged("Birmingham").public
+    # Restrict traces to those for a given user with a tiven tag
+    get :georss, :params => { :display_name => user.display_name, :tag => "Birmingham", :format => :rss }
+    check_trace_feed user.traces.tagged("Birmingham").visible_to_all
   end
 
   # Test viewing a trace
   def test_view
+    public_trace_file = create(:trace, :visibility => "public")
+
     # First with no auth, which should work since the trace is public
-    get :view, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}
-    check_trace_view gpx_files(:public_trace_file)
+    get :view, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
+    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 => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id}
-    check_trace_view gpx_files(:public_trace_file)
+    get :view, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
+    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 => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id}
-    check_trace_view gpx_files(:public_trace_file)
+    get :view, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
+    check_trace_view public_trace_file
   end
 
   # Check an anonymous trace can't be viewed by another user
   def test_view_anon
+    anon_trace_file = create(:trace, :visibility => "private")
+
     # First with no auth
-    get :view, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}
+    get :view, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }
     assert_response :redirect
     assert_redirected_to :action => :list
 
-    # Now with some other user, which should work since the trace is anon
-    get :view, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:normal_user).id}
+    # Now with some other user, which should not work since the trace is anon
+    get :view, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => create(:user) }
     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 => gpx_files(:anon_trace_file).id}, {:user => users(:public_user).id}
-    check_trace_view gpx_files(:anon_trace_file)
+    get :view, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => anon_trace_file.user }
+    check_trace_view anon_trace_file
   end
 
   # Test viewing a trace that doesn't exist
   def test_view_not_found
-    # First with no auth, which should work since the trace is public
-    get :view, {:display_name => users(:public_user).display_name, :id => 0}
-    assert_response :redirect
-    assert_redirected_to :action => :list
+    deleted_trace_file = create(:trace, :deleted)
 
-    # Now with some other user, which should work since the trace is public
-    get :view, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id}
+    # First with a trace that has never existed
+    get :view, :params => { :display_name => create(:user).display_name, :id => 0 }
     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 => 5}, {:user => users(:public_user).id}
+    # Now with a trace that has been deleted
+    get :view, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
     assert_response :redirect
     assert_redirected_to :action => :list
   end
 
   # Test downloading a trace
   def test_data
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
+
     # First with no auth, which should work since the trace is public
-    get :data, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}
-    check_trace_data gpx_files(:public_trace_file)
+    get :data, :params => { :display_name => public_trace_file.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 => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id}
-    check_trace_data gpx_files(:public_trace_file)
+    get :data, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(: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 => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id}
-    check_trace_data gpx_files(:public_trace_file)
+    get :data, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
+    check_trace_data public_trace_file
   end
 
   # Test downloading a compressed trace
   def test_data_compressed
+    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 => gpx_files(:identifiable_trace_file).id}
-    check_trace_data gpx_files(:identifiable_trace_file), "application/x-gzip", "gpx.gz"
+    get :data, :params => { :display_name => identifiable_trace_file.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 => gpx_files(:identifiable_trace_file).id, :format => "xml"}
-    check_trace_data gpx_files(:identifiable_trace_file), "application/xml", "xml"
+    get :data, :params => { :display_name => identifiable_trace_file.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 => gpx_files(:identifiable_trace_file).id, :format => "gpx"}
-    check_trace_data gpx_files(:identifiable_trace_file)
+    get :data, :params => { :display_name => identifiable_trace_file.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
+    anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
+
     # First with no auth
-    get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}
+    get :data, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }
     assert_response :not_found
 
-    # Now with some other user, which should work since the trace is anon
-    get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:normal_user).id}
+    # Now with some other user, which shouldn't work since the trace is anon
+    get :data, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => create(: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 => gpx_files(:anon_trace_file).id}, {:user => users(:public_user).id}
-    check_trace_data gpx_files(:anon_trace_file)
+    get :data, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => anon_trace_file.user }
+    check_trace_data anon_trace_file
   end
 
   # Test downloading a trace that doesn't exist
   def test_data_not_found
-    # First with no auth, which should work since the trace is public
-    get :data, {:display_name => users(:public_user).display_name, :id => 0}
+    deleted_trace_file = create(:trace, :deleted)
+
+    # First with a trace that has never existed
+    get :data, :params => { :display_name => create(:user).display_name, :id => 0 }
+    assert_response :not_found
+
+    # Now with a trace that has been deleted
+    get :data, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
     assert_response :not_found
+  end
+
+  # Test downloading the picture for a trace
+  def test_picture
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
+
+    # First with no auth, which should work since the trace is public
+    get :picture, :params => { :display_name => public_trace_file.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 :data, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id}
+    get :picture, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
+    check_trace_picture public_trace_file
+
+    # And finally we should be able to do it with the owner of the trace
+    get :picture, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.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
+    anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
+
+    # First with no auth
+    get :picture, :params => { :display_name => anon_trace_file.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, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => create(:user) }
+    assert_response :forbidden
+
+    # And finally we should be able to do it with the owner of the trace
+    get :picture, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => anon_trace_file.user }
+    check_trace_picture anon_trace_file
+  end
+
+  # Test downloading the picture for a trace that doesn't exist
+  def test_picture_not_found
+    deleted_trace_file = create(:trace, :deleted)
+
+    # First with a trace that has never existed
+    get :picture, :params => { :display_name => create(:user).display_name, :id => 0 }
     assert_response :not_found
 
+    # Now with a trace that has been deleted
+    get :picture, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
+    assert_response :not_found
+  end
+
+  # Test downloading the icon for a trace
+  def test_icon
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
+
+    # First with no auth, which should work since the trace is public
+    get :icon, :params => { :display_name => public_trace_file.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, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
+    check_trace_icon public_trace_file
+
+    # And finally we should be able to do it with the owner of the trace
+    get :icon, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.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
+    anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
+
+    # First with no auth
+    get :icon, :params => { :display_name => anon_trace_file.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, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => create(:user) }
+    assert_response :forbidden
+
     # 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 => 5}, {:user => users(:public_user).id}
+    get :icon, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => anon_trace_file.user }
+    check_trace_icon anon_trace_file
+  end
+
+  # Test downloading the icon for a trace that doesn't exist
+  def test_icon_not_found
+    deleted_trace_file = create(:trace, :deleted)
+
+    # First with a trace that has never existed
+    get :icon, :params => { :display_name => create(:user).display_name, :id => 0 }
+    assert_response :not_found
+
+    # Now with a trace that has been deleted
+    get :icon, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
     assert_response :not_found
   end
 
-  # Test fetching the edit page for a trace
+  # Test fetching the create page
+  def test_create_get
+    # First with no auth
+    get :create
+    assert_response :redirect
+    assert_redirected_to :controller => :user, :action => :login, :referer => trace_create_path
+
+    # Now authenticated as a user with gps.trace.visibility set
+    user = create(:user)
+    create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
+    get :create, :session => { :user => 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
+    second_user = create(:user)
+    create(:user_preference, :user => second_user, :k => "gps.trace.public", :v => "default")
+    get :create, :session => { :user => second_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
+    third_user = create(:user)
+    get :create, :session => { :user => third_user }
+    assert_response :success
+    assert_template :create
+    assert_select "select#trace_visibility option[value=private][selected]", 1
+  end
+
+  # Test creating a trace
+  def test_create_post
+    # Get file to use
+    fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx")
+    file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml")
+    user = create(:user)
+
+    # First with no auth
+    post :create, :params => { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }
+    assert_response :forbidden
+
+    # 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
+    post :create, :params => { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, :session => { :user => user }
+    assert_response :redirect
+    assert_redirected_to :action => :list, :display_name => 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", user.preferences.where(:k => "gps.trace.visibility").first.v
+  end
+
+  # Test fetching the edit page for a trace using GET
   def test_edit_get
+    public_trace_file = create(:trace, :visibility => "public")
+    deleted_trace_file = create(:trace, :deleted)
+
     # First with no auth
-    get :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}
+    get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id)
+    assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => public_trace_file.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 => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id}
+    get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(: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).id}
+    get :edit, :params => { :display_name => create(:user).display_name, :id => 0 }, :session => { :user => create(:user) }
     assert_response :not_found
 
     # Now with a trace which has been deleted
-    get :edit, {:display_name => users(:public_user).display_name, :id => gpx_files(:deleted_trace_file).id}, {:user => users(:public_user).id}
+    get :edit, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.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 => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id}
+    get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.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")
+    deleted_trace_file = create(:trace, :deleted)
+
+    # First with no auth
+    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
+    assert_response :forbidden
+
+    # Now with some other user, which should fail
+    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
+    assert_response :forbidden
+
+    # Now with a trace which doesn't exist
+    post :edit, :params => { :display_name => create(:user).display_name, :id => 0 }, :session => { :user => create(:user) }
+    assert_response :not_found
+
+    # Now with a trace which has been deleted
+    post :edit, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
+    assert_response :not_found
+
+    # Finally with a trace that we are allowed to edit
+    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
     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")
+    deleted_trace_file = create(:trace, :deleted)
+
     # New details
     new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" }
 
     # First with no auth
-    post :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id, :trace => new_details}
+    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }
     assert_response :forbidden
 
     # Now with some other user, which should fail
-    post :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id, :trace => new_details}, {:user => users(:public_user).id}
+    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, :session => { :user => create(:user) }
     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, :params => { :display_name => create(:user).display_name, :id => 0 }, :session => { :user => create(:user), :trace => new_details }
     assert_response :not_found
 
     # Now with a trace which has been deleted
-    post :edit, {:display_name => users(:public_user).display_name, :id => gpx_files(:deleted_trace_file).id, :trace => new_details}, {:user => users(:public_user).id}
+    post :edit, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id, :trace => new_details }, :session => { :user => deleted_trace_file.user }
     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit
-    post :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id, :trace => new_details}, {:user => users(:normal_user).id}
+    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, :session => { :user => public_trace_file.user }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
-    trace = Trace.find(gpx_files(:public_trace_file).id)
+    assert_redirected_to :action => :view, :display_name => public_trace_file.user.display_name
+    trace = Trace.find(public_trace_file.id)
     assert_equal new_details[:description], trace.description
     assert_equal new_details[:tagstring], trace.tagstring
     assert_equal new_details[:visibility], trace.visibility
@@ -389,120 +656,275 @@ class TraceControllerTest < ActionController::TestCase
 
   # Test deleting a trace
   def test_delete
+    public_trace_file = create(:trace, :visibility => "public")
+    deleted_trace_file = create(:trace, :deleted)
+
     # First with no auth
-    post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id,}
+    post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
     assert_response :forbidden
 
     # Now with some other user, which should fail
-    post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id}
+    post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
     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, :params => { :display_name => create(:user).display_name, :id => 0 }, :session => { :user => create(:user) }
     assert_response :not_found
 
     # Now with a trace has already been deleted
-    post :delete, {:display_name => users(:public_user).display_name, :id => gpx_files(:deleted_trace_file).id}, {:user => users(:public_user).id}
+    post :delete, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
     assert_response :not_found
 
     # Finally with a trace that we are allowed to delete
-    post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id}
+    post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
     assert_response :redirect
-    assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name
-    trace = Trace.find(gpx_files(:public_trace_file).id)
+    assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name
+    trace = Trace.find(public_trace_file.id)
     assert_equal false, trace.visible
   end
 
   # Check getting a specific trace through the api
   def test_api_read
+    public_trace_file = create(:trace, :visibility => "public")
+
     # First with no auth
-    get :api_read, :id => gpx_files(:public_trace_file).id
+    get :api_read, :params => { :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_read, :id => gpx_files(:public_trace_file).id
+    basic_authorization(create(:user).display_name, "test")
+    get :api_read, :params => { :id => 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_read, :id => gpx_files(:public_trace_file).id
+    basic_authorization(public_trace_file.user.display_name, "test")
+    get :api_read, :params => { :id => public_trace_file.id }
     assert_response :success
   end
 
   # Check an anoymous trace can't be specifically fetched by another user
   def test_api_read_anon
-    # Furst with no auth
-    get :api_read, :id => gpx_files(:anon_trace_file).id
+    anon_trace_file = create(:trace, :visibility => "private")
+
+    # First with no auth
+    get :api_read, :params => { :id => 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_read, :id => gpx_files(:anon_trace_file).id
+    basic_authorization(create(:user).display_name, "test")
+    get :api_read, :params => { :id => 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_read, :id => gpx_files(:anon_trace_file).id
+    basic_authorization(anon_trace_file.user.display_name, "test")
+    get :api_read, :params => { :id => anon_trace_file.id }
     assert_response :success
   end
 
   # Check the api details for a trace that doesn't exist
   def test_api_read_not_found
-    # Try first with no auth, as it should requure it
-    get :api_read, :id => 0
+    deleted_trace_file = create(:trace, :deleted)
+
+    # Try first with no auth, as it should require it
+    get :api_read, :params => { :id => 0 }
+    assert_response :unauthorized
+
+    # Login, and try again
+    basic_authorization(deleted_trace_file.user.display_name, "test")
+    get :api_read, :params => { :id => 0 }
+    assert_response :not_found
+
+    # Now try a trace which did exist but has been deleted
+    basic_authorization(deleted_trace_file.user.display_name, "test")
+    get :api_read, :params => { :id => deleted_trace_file.id }
+    assert_response :not_found
+  end
+
+  # Test downloading a trace through the api
+  def test_api_data
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
+
+    # First with no auth
+    get :api_data, :params => { :id => public_trace_file.id }
+    assert_response :unauthorized
+
+    # Now with some other user, which should work since the trace is public
+    basic_authorization(create(:user).display_name, "test")
+    get :api_data, :params => { :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(public_trace_file.user.display_name, "test")
+    get :api_data, :params => { :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
+    identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d")
+
+    # Authenticate as the owner of the trace we will be using
+    basic_authorization(identifiable_trace_file.user.display_name, "test")
+
+    # First get the data as is
+    get :api_data, :params => { :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, :params => { :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, :params => { :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
+    anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
+
+    # First with no auth
+    get :api_data, :params => { :id => anon_trace_file.id }
+    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 :api_data, :params => { :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(anon_trace_file.user.display_name, "test")
+    get :api_data, :params => { :id => anon_trace_file.id }
+    check_trace_data anon_trace_file
+  end
+
+  # Test downloading a trace that doesn't exist through the api
+  def test_api_data_not_found
+    deleted_trace_file = create(:trace, :deleted)
+
+    # Try first with no auth, as it should require it
+    get :api_data, :params => { :id => 0 }
     assert_response :unauthorized
 
     # Login, and try again
-    basic_authorization(users(:public_user).display_name, "test")
-    get :api_read, :id => 0
+    basic_authorization(create(:user).display_name, "test")
+    get :api_data, :params => { :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
+    basic_authorization(deleted_trace_file.user.display_name, "test")
+    get :api_data, :params => { :id => deleted_trace_file.id }
     assert_response :not_found
   end
 
+  # Test creating a trace through the api
+  def test_api_create
+    # Get file to use
+    fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx")
+    file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml")
+    user = create(:user)
+
+    # First with no auth
+    post :api_create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }
+    assert_response :unauthorized
+
+    # 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 :api_create, :params => { :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", 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", user.preferences.where(:k => "gps.trace.visibility").first.v
+    basic_authorization(user.display_name, "test")
+    post :api_create, :params => { :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", user.preferences.where(:k => "gps.trace.visibility").first.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
+    basic_authorization(second_user.display_name, "test")
+    post :api_create, :params => { :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", second_user.preferences.where(:k => "gps.trace.visibility").first.v
+  end
+
   # Check updating a trace through the api
   def test_api_update
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
+    deleted_trace_file = create(:trace, :deleted)
+    anon_trace_file = create(:trace, :visibility => "private")
+
     # First with no auth
-    content gpx_files(:public_trace_file).to_xml
-    put :api_update, :id => gpx_files(:public_trace_file).id
+    content public_trace_file.to_xml
+    put :api_update, :params => { :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 gpx_files(:public_trace_file).to_xml
-    put :api_update, :id => gpx_files(:public_trace_file).id
+    basic_authorization(create(:user).display_name, "test")
+    content public_trace_file.to_xml
+    put :api_update, :params => { :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 gpx_files(:public_trace_file).to_xml
-    put :api_update, :id => 0
+    basic_authorization(create(:user).display_name, "test")
+    content public_trace_file.to_xml
+    put :api_update, :params => { :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
+    basic_authorization(deleted_trace_file.user.display_name, "test")
+    content deleted_trace_file.to_xml
+    put :api_update, :params => { :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 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"
+    basic_authorization(public_trace_file.user.display_name, "test")
+    content anon_trace_file.to_xml
+    put :api_update, :params => { :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 = gpx_files(:public_trace_file)
+    basic_authorization(public_trace_file.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
+    put :api_update, :params => { :id => t.id }
     assert_response :success
     nt = Trace.find(t.id)
     assert_equal nt.description, t.description
@@ -511,32 +933,34 @@ class TraceControllerTest < ActionController::TestCase
 
   # Check deleting a trace through the api
   def test_api_delete
+    public_trace_file = create(:trace, :visibility => "public")
+
     # First with no auth
-    delete :api_delete, :id => gpx_files(:public_trace_file).id
+    delete :api_delete, :params => { :id => 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
+    basic_authorization(create(:user).display_name, "test")
+    delete :api_delete, :params => { :id => 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
+    basic_authorization(create(:user).display_name, "test")
+    delete :api_delete, :params => { :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
+    basic_authorization(public_trace_file.user.display_name, "test")
+    delete :api_delete, :params => { :id => 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
+    basic_authorization(public_trace_file.user.display_name, "test")
+    delete :api_delete, :params => { :id => public_trace_file.id }
     assert_response :not_found
   end
 
-private
+  private
 
   def check_trace_feed(traces)
     assert_response :success
@@ -549,12 +973,12 @@ private
         assert_select "link"
         assert_select "image"
         assert_select "item", :count => traces.visible.count do |items|
-          traces.visible.order("timestamp DESC").zip(items).each do |trace,item|
+          traces.visible.order("timestamp DESC").zip(items).each do |trace, item|
             assert_select item, "title", trace.name
             assert_select item, "link", "http://test.host/user/#{trace.user.display_name}/traces/#{trace.id}"
             assert_select item, "guid", "http://test.host/user/#{trace.user.display_name}/traces/#{trace.id}"
             assert_select item, "description"
-#            assert_select item, "dc:creator", trace.user.display_name
+            # assert_select item, "dc:creator", trace.user.display_name
             assert_select item, "pubDate", trace.timestamp.rfc822
           end
         end
@@ -566,11 +990,12 @@ private
     assert_response :success
     assert_template "list"
 
-    if traces.count > 0
+    if !traces.empty?
       assert_select "table#trace_list tbody", :count => 1 do
-        assert_select "tr", :count => traces.visible.count do |rows|
-          traces.visible.order("timestamp DESC").zip(rows).each do |trace,row|
-            assert_select row, "span.trace_summary", Regexp.new(Regexp.escape("(#{trace.size} points)"))
+        assert_select "tr", :count => traces.length do |rows|
+          traces.zip(rows).each do |trace, row|
+            assert_select row, "a", Regexp.new(Regexp.escape(trace.name))
+            assert_select row, "span.trace_summary", Regexp.new(Regexp.escape("(#{trace.size} points)")) if trace.inserted?
             assert_select row, "td", Regexp.new(Regexp.escape(trace.description))
             assert_select row, "td", Regexp.new(Regexp.escape("by #{trace.user.display_name}"))
           end
@@ -594,7 +1019,19 @@ private
 
   def check_trace_data(trace, content_type = "application/gpx+xml", extension = "gpx")
     assert_response :success
-    assert_equal content_type, @response.content_type
+    assert_equal content_type, response.content_type
     assert_equal "attachment; filename=\"#{trace.id}.#{extension}\"", @response.header["Content-Disposition"]
   end
+
+  def check_trace_picture(trace)
+    assert_response :success
+    assert_equal "image/gif", response.content_type
+    assert_equal trace.large_picture, response.body
+  end
+
+  def check_trace_icon(trace)
+    assert_response :success
+    assert_equal "image/gif", response.content_type
+    assert_equal trace.icon_picture, response.body
+  end
 end