X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/90e46a58de583ac2bd7bb43077faa94186957a7a..bc31329da1c98f99d52a6f37ac8bb256012eb4f6:/test/functional/trace_controller_test.rb

diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index aca2a59d8..d0afcc587 100644
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -140,6 +140,10 @@ class TraceControllerTest < ActionController::TestCase
       { :path => "/trace/1/edit", :method => :post },
       { :controller => "trace", :action => "edit", :id => "1" }
     )
+    assert_routing(
+      { :path => "/trace/1/edit", :method => :put },
+      { :controller => "trace", :action => "edit", :id => "1" }
+    )
     assert_routing(
       { :path => "/trace/1/delete", :method => :post },
       { :controller => "trace", :action => "delete", :id => "1" }
@@ -150,7 +154,8 @@ class TraceControllerTest < ActionController::TestCase
   def test_list
     get :list
     assert_response :success
-    assert_template 'list'
+    assert_template "list"
+    check_trace_list Trace.public
   end
 
   # Check that I can get mine
@@ -164,6 +169,43 @@ 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}
+    assert_response :success
+    assert_template "list"
+    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
+    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
   end
 
   # Check that the rss loads
@@ -303,4 +345,24 @@ class TraceControllerTest < ActionController::TestCase
     delete :api_delete, :id => gpx_files(:public_trace_file).id
     assert_response :not_found
   end
+
+private
+
+  def check_trace_list(traces)
+    traces = traces.visible.order("timestamp DESC")
+    
+    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 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
 end