X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b3e540a6b6d9b9833ae57d9067774deb592c5164..5c0e96e0e0e99b3469c286f4bf77d4d0abf47c79:/test/functional/trace_controller_test.rb?ds=sidebyside

diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 06095c603..1a074082b 100644
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -4,6 +4,16 @@ 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")
+  end
+
+  def teardown
+    Object.send("remove_const", "GPX_TRACE_DIR")
+    Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir)
+  end
+
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -88,19 +98,19 @@ class TraceControllerTest < ActionController::TestCase
 
     assert_routing(
       { :path => "/traces/rss", :method => :get },
-      { :controller => "trace", :action => "georss" }
+      { :controller => "trace", :action => "georss", :format => :rss }
     )
     assert_routing(
       { :path => "/traces/tag/tagname/rss", :method => :get },
-      { :controller => "trace", :action => "georss", :tag => "tagname" }
+      { :controller => "trace", :action => "georss", :tag => "tagname", :format => :rss }
     )
     assert_routing(
       { :path => "/user/username/traces/rss", :method => :get },
-      { :controller => "trace", :action => "georss", :display_name => "username" }
+      { :controller => "trace", :action => "georss", :display_name => "username", :format => :rss }
     )
     assert_routing(
       { :path => "/user/username/traces/tag/tagname/rss", :method => :get },
-      { :controller => "trace", :action => "georss", :display_name => "username", :tag => "tagname" }
+      { :controller => "trace", :action => "georss", :display_name => "username", :tag => "tagname", :format => :rss }
     )
 
     assert_routing(
@@ -141,7 +151,7 @@ class TraceControllerTest < ActionController::TestCase
       { :controller => "trace", :action => "edit", :id => "1" }
     )
     assert_routing(
-      { :path => "/trace/1/edit", :method => :put },
+      { :path => "/trace/1/edit", :method => :patch },
       { :controller => "trace", :action => "edit", :id => "1" }
     )
     assert_routing(
@@ -153,15 +163,14 @@ class TraceControllerTest < ActionController::TestCase
   # Check that the list of changesets is displayed
   def test_list
     get :list
-    assert_response :success
-    assert_template "list"
     check_trace_list Trace.public
+
+    get :list, :tag => "London"
+    check_trace_list Trace.tagged("London").public
   end
 
   # Check that I can get mine
   def test_list_mine
-    @request.cookies["_osm_username"] = users(:public_user).display_name
-
     # First try to get it when not logged in
     get :mine
     assert_redirected_to :controller => 'user', :action => 'login', :referer => '/traces/mine'
@@ -172,8 +181,6 @@ class TraceControllerTest < ActionController::TestCase
 
     # Fetch the actual list
     get :list, {:display_name => users(:public_user).display_name}, {:user => users(:public_user).id}
-    assert_response :success
-    assert_template "list"
     check_trace_list users(:public_user).traces
   end
 
@@ -181,48 +188,231 @@ class TraceControllerTest < ActionController::TestCase
   def test_list_user
     # Test a user with no traces
     get :list, :display_name => users(:second_public_user).display_name
-    assert_response :success
-    assert_template "list"
     check_trace_list users(:second_public_user).traces.public
 
     # Test a user with some traces - should see only public ones
     get :list, :display_name => users(:public_user).display_name
-    assert_response :success
-    assert_template "list"
     check_trace_list users(:public_user).traces.public
 
-    @request.cookies["_osm_username"] = users(:normal_user).display_name
-
     # 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}
-    assert_response :success
-    assert_template "list"
     check_trace_list users(:public_user).traces.public
 
-    @request.cookies["_osm_username"] = users(:public_user).display_name
-
     # Should see all traces when authenticated as the target user
     get :list, {:display_name => users(:public_user).display_name}, {:user => users(:public_user).id}
-    assert_response :success
-    assert_template "list"
     check_trace_list users(:public_user).traces
+
+    # 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")
   end
 
   # Check that the rss loads
   def test_rss
-    get :georss
+    get :georss, :format => :rss
     check_trace_feed Trace.public
 
-    get :georss, :tag => "London"
+    get :georss, :tag => "London", :format => :rss
     check_trace_feed Trace.tagged("London").public
 
-    get :georss, :display_name => users(:public_user).display_name
+    get :georss, :display_name => users(:public_user).display_name, :format => :rss
     check_trace_feed users(:public_user).traces.public
 
-    get :georss, :display_name => users(:public_user).display_name, :tag => "Birmingham"
+    get :georss, :display_name => users(:public_user).display_name, :tag => "Birmingham", :format => :rss
     check_trace_feed users(:public_user).traces.tagged("Birmingham").public
   end
 
+  # Test viewing a trace
+  def test_view
+    # 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)
+
+    # 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)
+
+    # 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)
+  end
+
+  # Check an anonymous trace can't be viewed by another user
+  def test_view_anon
+    # First with no auth
+    get :view, {:display_name => users(:public_user).display_name, :id => gpx_files(: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}
+    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)
+  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
+
+    # 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}
+    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}
+    assert_response :redirect
+    assert_redirected_to :action => :list
+  end
+
+  # Test downloading a trace
+  def test_data
+    # 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)
+
+    # 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)
+
+    # 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)
+  end
+
+  # Test downloading a compressed trace
+  def test_data_compressed
+    # 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"
+
+    # 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"
+
+    # 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)
+  end
+
+  # Check an anonymous trace can't be downloaded by another user
+  def test_data_anon
+    # First with no auth
+    get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(: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}
+    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)
+  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}
+    assert_response :not_found
+
+    # 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}
+    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 => 5}, {:user => users(:public_user).id}
+    assert_response :not_found
+  end
+
+  # Test fetching the edit page for a trace
+  def test_edit_get
+    # First with no auth
+    get :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(: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)
+
+    # 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}
+    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}
+    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}
+    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}
+    assert_response :success
+  end
+
+  # Test saving edits to a trace
+  def test_edit_post
+    # 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}
+    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}
+    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}
+    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}
+    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}
+    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_equal new_details[:description], trace.description
+    assert_equal new_details[:tagstring], trace.tagstring
+    assert_equal new_details[:visibility], trace.visibility
+  end
+
+  # Test deleting a trace
+  def test_delete
+    # First with no auth
+    post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(: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}
+    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}
+    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}
+    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}
+    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_equal false, trace.visible
+  end
+
   # Check getting a specific trace through the api
   def test_api_read
     # First with no auth
@@ -350,7 +540,7 @@ private
 
   def check_trace_feed(traces)
     assert_response :success
-    assert_template nil
+    assert_template "georss"
     assert_equal "application/rss+xml", @response.content_type
     assert_select "rss", :count => 1 do
       assert_select "channel", :count => 1 do
@@ -364,7 +554,7 @@ private
             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, "author", trace.user.display_name
+#            assert_select item, "dc:creator", trace.user.display_name
             assert_select item, "pubDate", trace.timestamp.rfc822
           end
         end
@@ -373,12 +563,13 @@ private
   end
 
   def check_trace_list(traces)
-    traces = traces.visible.order("timestamp DESC")
-    
+    assert_response :success
+    assert_template "list"
+
     if traces.count > 0
       assert_select "table#trace_list tbody", :count => 1 do
-        assert_select "tr", :count => traces.count do |rows|
-          traces.zip(rows).each do |trace,row|
+        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 row, "td", Regexp.new(Regexp.escape(trace.description))
             assert_select row, "td", Regexp.new(Regexp.escape("by #{trace.user.display_name}"))
@@ -389,4 +580,21 @@ private
       assert_select "h4", /Nothing here yet/
     end
   end
+
+  def check_trace_view(trace)
+    assert_response :success
+    assert_template "view"
+
+    assert_select "table", :count => 1 do
+      assert_select "td", /^#{Regexp.quote(trace.name)} /
+      assert_select "td", trace.user.display_name
+      assert_select "td", trace.description
+    end
+  end
+
+  def check_trace_data(trace, content_type = "application/gpx+xml", extension = "gpx")
+    assert_response :success
+    assert_equal content_type, @response.content_type
+    assert_equal "attachment; filename=\"#{trace.id}.#{extension}\"", @response.header["Content-Disposition"]
+  end
 end