X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/58d889436fc05c1a3c32cf6aa28cc751badf99ad..7417d142998219a94f8cd2eb97fcfed555a99e30:/test/functional/trace_controller_test.rb

diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 8ff29c437..838fac9a6 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(
@@ -153,8 +153,10 @@ 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
@@ -168,21 +170,112 @@ class TraceControllerTest < ActionController::TestCase
     # 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
+
+    # 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
+  end
+
+  # Check the list of changesets for a specific user
+  def test_list_user
+    # 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
+
+    # 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
+
+    @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}
+    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}
+    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
-    assert_rss_success
+    get :georss, :format => :rss
+    check_trace_feed Trace.public
+
+    get :georss, :tag => "London", :format => :rss
+    check_trace_feed Trace.tagged("London").public
 
-    get :georss, :display_name => users(:normal_user).display_name
-    assert_rss_success
+    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", :format => :rss
+    check_trace_feed users(:public_user).traces.tagged("Birmingham").public
   end
 
-  def assert_rss_success
-    assert_response :success
-    assert_template nil
-    assert_equal "application/rss+xml", @response.content_type
+  # 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
 
   # Check getting a specific trace through the api
@@ -307,4 +400,60 @@ class TraceControllerTest < ActionController::TestCase
     delete :api_delete, :id => gpx_files(:public_trace_file).id
     assert_response :not_found
   end
+
+private
+
+  def check_trace_feed(traces)
+    assert_response :success
+    assert_template "georss"
+    assert_equal "application/rss+xml", @response.content_type
+    assert_select "rss", :count => 1 do
+      assert_select "channel", :count => 1 do
+        assert_select "title"
+        assert_select "description"
+        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|
+            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, "pubDate", trace.timestamp.rfc822
+          end
+        end
+      end
+    end
+  end
+
+  def check_trace_list(traces)
+    assert_response :success
+    assert_template "list"
+
+    if traces.count > 0
+      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 row, "td", Regexp.new(Regexp.escape(trace.description))
+            assert_select row, "td", Regexp.new(Regexp.escape("by #{trace.user.display_name}"))
+          end
+        end
+      end
+    else
+      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