X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b3e540a6b6d9b9833ae57d9067774deb592c5164..3b34f700f1af3cee87a591c5cecd897b5529dec0:/test/functional/trace_controller_test.rb

diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 06095c603..799f0759f 100644
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -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,9 +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
@@ -172,8 +173,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,45 +180,41 @@ 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
 
@@ -350,7 +345,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 +359,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 +368,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}"))