X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/28d4695927f3d29423c273565d024688814b7684..4f05b6a8accae4877f81e617262a52cf0428cf8f:/test/functional/trace_controller_test.rb

diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 4f75308ef..a5f3c5a3d 100644
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -88,19 +88,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 +141,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(
@@ -205,19 +205,172 @@ class TraceControllerTest < ActionController::TestCase
 
   # 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)
+
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    # 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)
+
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
+    # 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
+
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
+    # 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
+
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    # 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
+
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    # 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 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)
+
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    # 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
+
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
+    # 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
+
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    # 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
+
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
+    # 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
+
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    # 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
+
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
+    # 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
@@ -345,7 +498,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
@@ -359,7 +512,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
@@ -385,4 +538,15 @@ 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
 end