Use the standard ruby instance_methods call

[rails.git] / test / functional / trace_controller_test.rb

diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 06095c603c38afdaba4e91993f4d657f81495995..4f75308ef4ddc8785ca8c4d0d2874108919cefa1 100644 (file)
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -153,9 +153,10 @@ class TraceControllerTest < ActionController::TestCase
   # Check that the list of changesets is displayed
   def test_list
     get :list
   # Check that the list of changesets is displayed
   def test_list
     get :list

-    assert_response :success
-    assert_template "list"

     check_trace_list Trace.public
     check_trace_list Trace.public

+
+    get :list, :tag => "London"
+    check_trace_list Trace.tagged("London").public

   end
 
   # Check that I can get mine
   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}
 
     # 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_trace_list users(:public_user).traces
   end
 


@@ -181,31 +180,27 @@ class TraceControllerTest < ActionController::TestCase
   def test_list_user
     # Test a user with no traces
     get :list, :display_name => users(:second_public_user).display_name
   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
     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}
     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}
     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
     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
   end
 
   # Check that the rss loads


@@ -373,12 +368,13 @@ private
   end
 
   def check_trace_list(traces)
   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
     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}"))
             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}"))