Merge remote-tracking branch 'upstream/pull/2125'

[rails.git] / test / controllers / traces_controller_test.rb

diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb
index fbbbe4adc341bd9d0fe9c932b153253bca080b4b..cd30746fe4a15b7d5315b3168b08a696a3618b26 100644 (file)
--- a/test/controllers/traces_controller_test.rb
+++ b/test/controllers/traces_controller_test.rb
@@ -56,35 +56,35 @@ class TracesControllerTest < ActionController::TestCase
 
     assert_routing(
       { :path => "/traces", :method => :get },
 
     assert_routing(
       { :path => "/traces", :method => :get },

-      { :controller => "traces", :action => "list" }
+      { :controller => "traces", :action => "index" }

     )
     assert_routing(
       { :path => "/traces/page/1", :method => :get },
     )
     assert_routing(
       { :path => "/traces/page/1", :method => :get },

-      { :controller => "traces", :action => "list", :page => "1" }
+      { :controller => "traces", :action => "index", :page => "1" }

     )
     assert_routing(
       { :path => "/traces/tag/tagname", :method => :get },
     )
     assert_routing(
       { :path => "/traces/tag/tagname", :method => :get },

-      { :controller => "traces", :action => "list", :tag => "tagname" }
+      { :controller => "traces", :action => "index", :tag => "tagname" }

     )
     assert_routing(
       { :path => "/traces/tag/tagname/page/1", :method => :get },
     )
     assert_routing(
       { :path => "/traces/tag/tagname/page/1", :method => :get },

-      { :controller => "traces", :action => "list", :tag => "tagname", :page => "1" }
+      { :controller => "traces", :action => "index", :tag => "tagname", :page => "1" }

     )
     assert_routing(
       { :path => "/user/username/traces", :method => :get },
     )
     assert_routing(
       { :path => "/user/username/traces", :method => :get },

-      { :controller => "traces", :action => "list", :display_name => "username" }
+      { :controller => "traces", :action => "index", :display_name => "username" }

     )
     assert_routing(
       { :path => "/user/username/traces/page/1", :method => :get },
     )
     assert_routing(
       { :path => "/user/username/traces/page/1", :method => :get },

-      { :controller => "traces", :action => "list", :display_name => "username", :page => "1" }
+      { :controller => "traces", :action => "index", :display_name => "username", :page => "1" }

     )
     assert_routing(
       { :path => "/user/username/traces/tag/tagname", :method => :get },
     )
     assert_routing(
       { :path => "/user/username/traces/tag/tagname", :method => :get },

-      { :controller => "traces", :action => "list", :display_name => "username", :tag => "tagname" }
+      { :controller => "traces", :action => "index", :display_name => "username", :tag => "tagname" }

     )
     assert_routing(
       { :path => "/user/username/traces/tag/tagname/page/1", :method => :get },
     )
     assert_routing(
       { :path => "/user/username/traces/tag/tagname/page/1", :method => :get },

-      { :controller => "traces", :action => "list", :display_name => "username", :tag => "tagname", :page => "1" }
+      { :controller => "traces", :action => "index", :display_name => "username", :tag => "tagname", :page => "1" }

     )
 
     assert_routing(
     )
 
     assert_routing(


@@ -123,7 +123,7 @@ class TracesControllerTest < ActionController::TestCase
 
     assert_routing(
       { :path => "/user/username/traces/1", :method => :get },
 
     assert_routing(
       { :path => "/user/username/traces/1", :method => :get },

-      { :controller => "traces", :action => "view", :display_name => "username", :id => "1" }
+      { :controller => "traces", :action => "show", :display_name => "username", :id => "1" }

     )
     assert_routing(
       { :path => "/user/username/traces/1/picture", :method => :get },
     )
     assert_routing(
       { :path => "/user/username/traces/1/picture", :method => :get },


@@ -151,12 +151,12 @@ class TracesControllerTest < ActionController::TestCase
       { :controller => "traces", :action => "data", :id => "1", :format => "xml" }
     )
     assert_routing(
       { :controller => "traces", :action => "data", :id => "1", :format => "xml" }
     )
     assert_routing(

-      { :path => "/trace/1/edit", :method => :get },
+      { :path => "/traces/1/edit", :method => :get },

       { :controller => "traces", :action => "edit", :id => "1" }
     )
     assert_routing(
       { :controller => "traces", :action => "edit", :id => "1" }
     )
     assert_routing(

-      { :path => "/trace/1/edit", :method => :post },
-      { :controller => "traces", :action => "edit", :id => "1" }
+      { :path => "/traces/1", :method => :put },
+      { :controller => "traces", :action => "update", :id => "1" }

     )
     assert_routing(
       { :path => "/trace/1/delete", :method => :post },
     )
     assert_routing(
       { :path => "/trace/1/delete", :method => :post },


@@ -164,8 +164,8 @@ class TracesControllerTest < ActionController::TestCase
     )
   end
 
     )
   end
 

-  # Check that the list of traces is displayed
-  def test_list
+  # Check that the index of traces is displayed
+  def test_index

     user = create(:user)
     # The fourth test below is surpisingly sensitive to timestamp ordering when the timestamps are equal.
     trace_a = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago) do |trace|
     user = create(:user)
     # The fourth test below is surpisingly sensitive to timestamp ordering when the timestamps are equal.
     trace_a = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago) do |trace|


@@ -181,25 +181,25 @@ class TracesControllerTest < ActionController::TestCase
       create(:tracetag, :trace => trace, :tag => "Birmingham")
     end
 
       create(:tracetag, :trace => trace, :tag => "Birmingham")
     end
 

-    # First with the public list
-    get :list
-    check_trace_list [trace_b, trace_a]
+    # First with the public index
+    get :index
+    check_trace_index [trace_b, trace_a]

 
     # Restrict traces to those with a given tag
 
     # Restrict traces to those with a given tag

-    get :list, :params => { :tag => "London" }
-    check_trace_list [trace_a]
+    get :index, :params => { :tag => "London" }
+    check_trace_index [trace_a]

 
     # Should see more when we are logged in
 
     # Should see more when we are logged in

-    get :list, :session => { :user => user }
-    check_trace_list [trace_d, trace_c, trace_b, trace_a]
+    get :index, :session => { :user => user }
+    check_trace_index [trace_d, trace_c, trace_b, trace_a]

 
     # Again, we should see more when we are logged in
 
     # Again, we should see more when we are logged in

-    get :list, :params => { :tag => "London" }, :session => { :user => user }
-    check_trace_list [trace_c, trace_a]
+    get :index, :params => { :tag => "London" }, :session => { :user => user }
+    check_trace_index [trace_c, trace_a]

   end
 
   # Check that I can get mine
   end
 
   # Check that I can get mine

-  def test_list_mine
+  def test_index_mine

     user = create(:user)
     create(:trace, :visibility => "public") do |trace|
       create(:tracetag, :trace => trace, :tag => "Birmingham")
     user = create(:user)
     create(:trace, :visibility => "public") do |trace|
       create(:tracetag, :trace => trace, :tag => "Birmingham")


@@ -210,19 +210,19 @@ class TracesControllerTest < ActionController::TestCase
 
     # First try to get it when not logged in
     get :mine
 
     # First try to get it when not logged in
     get :mine

-    assert_redirected_to :controller => "user", :action => "login", :referer => "/traces/mine"
+    assert_redirected_to :controller => "users", :action => "login", :referer => "/traces/mine"

 
     # Now try when logged in
     get :mine, :session => { :user => user }
 
     # Now try when logged in
     get :mine, :session => { :user => user }

-    assert_redirected_to :action => "list", :display_name => user.display_name
+    assert_redirected_to :action => "index", :display_name => user.display_name

 
 

-    # Fetch the actual list
-    get :list, :params => { :display_name => user.display_name }, :session => { :user => user }
-    check_trace_list [trace_b]
+    # Fetch the actual index
+    get :index, :params => { :display_name => user.display_name }, :session => { :user => user }
+    check_trace_index [trace_b]

   end
 
   end
 

-  # Check the list of traces for a specific user
-  def test_list_user
+  # Check the index of traces for a specific user
+  def test_index_user

     user = create(:user)
     second_user = create(:user)
     third_user = create(:user)
     user = create(:user)
     second_user = create(:user)
     third_user = create(:user)


@@ -233,121 +233,155 @@ class TracesControllerTest < ActionController::TestCase
     end
 
     # Test a user with no traces
     end
 
     # Test a user with no traces

-    get :list, :params => { :display_name => second_user.display_name }
-    check_trace_list []
+    get :index, :params => { :display_name => second_user.display_name }
+    check_trace_index []

 
     # Test the user with the traces - should see only public ones
 
     # Test the user with the traces - should see only public ones

-    get :list, :params => { :display_name => user.display_name }
-    check_trace_list [trace_b]
+    get :index, :params => { :display_name => user.display_name }
+    check_trace_index [trace_b]

 
     # Should still see only public ones when authenticated as another user
 
     # Should still see only public ones when authenticated as another user

-    get :list, :params => { :display_name => user.display_name }, :session => { :user => third_user }
-    check_trace_list [trace_b]
+    get :index, :params => { :display_name => user.display_name }, :session => { :user => third_user }
+    check_trace_index [trace_b]

 
     # Should see all traces when authenticated as the target user
 
     # Should see all traces when authenticated as the target user

-    get :list, :params => { :display_name => user.display_name }, :session => { :user => user }
-    check_trace_list [trace_c, trace_b]
+    get :index, :params => { :display_name => user.display_name }, :session => { :user => user }
+    check_trace_index [trace_c, trace_b]

 
     # Should only see traces with the correct tag when a tag is specified
 
     # Should only see traces with the correct tag when a tag is specified

-    get :list, :params => { :display_name => user.display_name, :tag => "London" }, :session => { :user => user }
-    check_trace_list [trace_c]
+    get :index, :params => { :display_name => user.display_name, :tag => "London" }, :session => { :user => user }
+    check_trace_index [trace_c]

 
     # Should get an error if the user does not exist
 
     # Should get an error if the user does not exist

-    get :list, :params => { :display_name => "UnknownUser" }
+    get :index, :params => { :display_name => "UnknownUser" }

     assert_response :not_found
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

   end
 
   end
 

-  # Check a multi-page list
-  def test_list_paged
+  # Check a multi-page index
+  def test_index_paged

     # Create several pages worth of traces
     create_list(:trace, 50)
 
     # Create several pages worth of traces
     create_list(:trace, 50)
 

-    # Try and get the list
-    get :list
+    # Try and get the index
+    get :index

     assert_response :success
     assert_select "table#trace_list tbody", :count => 1 do
       assert_select "tr", :count => 20
     end
 
     # Try and get the second page
     assert_response :success
     assert_select "table#trace_list tbody", :count => 1 do
       assert_select "tr", :count => 20
     end
 
     # Try and get the second page

-    get :list, :params => { :page => 2 }
+    get :index, :params => { :page => 2 }

     assert_response :success
     assert_select "table#trace_list tbody", :count => 1 do
       assert_select "tr", :count => 20
     end
   end
 
     assert_response :success
     assert_select "table#trace_list tbody", :count => 1 do
       assert_select "tr", :count => 20
     end
   end
 

-  # Check that the rss loads
+  # Check the RSS feed

   def test_rss
     user = create(:user)
   def test_rss
     user = create(:user)

+    # The fourth test below is surpisingly sensitive to timestamp ordering when the timestamps are equal.
+    trace_a = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago) do |trace|
+      create(:tracetag, :trace => trace, :tag => "London")
+    end
+    trace_b = create(:trace, :visibility => "public", :timestamp => 3.seconds.ago) do |trace|
+      create(:tracetag, :trace => trace, :tag => "Birmingham")
+    end
+    create(:trace, :visibility => "private", :user => user, :timestamp => 2.seconds.ago) do |trace|
+      create(:tracetag, :trace => trace, :tag => "London")
+    end
+    create(:trace, :visibility => "private", :user => user, :timestamp => 1.second.ago) do |trace|
+      create(:tracetag, :trace => trace, :tag => "Birmingham")
+    end

 
     # First with the public feed
     get :georss, :params => { :format => :rss }
 
     # First with the public feed
     get :georss, :params => { :format => :rss }

-    check_trace_feed Trace.visible_to_all
+    check_trace_feed [trace_b, trace_a]

 
     # Restrict traces to those with a given tag
     get :georss, :params => { :tag => "London", :format => :rss }
 
     # Restrict traces to those with a given tag
     get :georss, :params => { :tag => "London", :format => :rss }

-    check_trace_feed Trace.tagged("London").visible_to_all
+    check_trace_feed [trace_a]
+  end

 
 

-    # Restrict traces to those for a given user
+  # Check the RSS feed for a specific user
+  def test_rss_user
+    user = create(:user)
+    second_user = create(:user)
+    create(:user)
+    create(:trace)
+    trace_b = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago, :user => user)
+    trace_c = create(:trace, :visibility => "public", :timestamp => 3.seconds.ago, :user => user) do |trace|
+      create(:tracetag, :trace => trace, :tag => "London")
+    end
+    create(:trace, :visibility => "private")
+
+    # Test a user with no traces
+    get :georss, :params => { :display_name => second_user.display_name, :format => :rss }
+    check_trace_feed []
+
+    # Test the user with the traces - should see only public ones

     get :georss, :params => { :display_name => user.display_name, :format => :rss }
     get :georss, :params => { :display_name => user.display_name, :format => :rss }

-    check_trace_feed user.traces.visible_to_all
+    check_trace_feed [trace_c, trace_b]

 
 

-    # Restrict traces to those for a given user with a tiven tag
-    get :georss, :params => { :display_name => user.display_name, :tag => "Birmingham", :format => :rss }
-    check_trace_feed user.traces.tagged("Birmingham").visible_to_all
+    # Should only see traces with the correct tag when a tag is specified
+    get :georss, :params => { :display_name => user.display_name, :tag => "London", :format => :rss }
+    check_trace_feed [trace_c]
+
+    # Should no traces if the user does not exist
+    get :georss, :params => { :display_name => "UnknownUser", :format => :rss }
+    check_trace_feed []

   end
 
   end
 

-  # Test viewing a trace
-  def test_view
+  # Test showing a trace
+  def test_show

     public_trace_file = create(:trace, :visibility => "public")
 
     # First with no auth, which should work since the trace is public
     public_trace_file = create(:trace, :visibility => "public")
 
     # First with no auth, which should work since the trace is public

-    get :view, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
-    check_trace_view public_trace_file
+    get :show, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
+    check_trace_show public_trace_file

 
     # Now with some other user, which should work since the trace is public
 
     # Now with some other user, which should work since the trace is public

-    get :view, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
-    check_trace_view public_trace_file
+    get :show, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
+    check_trace_show public_trace_file

 
     # And finally we should be able to do it with the owner of the trace
 
     # And finally we should be able to do it with the owner of the trace

-    get :view, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
-    check_trace_view public_trace_file
+    get :show, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
+    check_trace_show public_trace_file

   end
 
   # Check an anonymous trace can't be viewed by another user
   end
 
   # Check an anonymous trace can't be viewed by another user

-  def test_view_anon
+  def test_show_anon

     anon_trace_file = create(:trace, :visibility => "private")
 
     # First with no auth
     anon_trace_file = create(:trace, :visibility => "private")
 
     # First with no auth

-    get :view, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }
+    get :show, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :list
+    assert_redirected_to :action => :index

 
     # Now with some other user, which should not work since the trace is anon
 
     # Now with some other user, which should not work since the trace is anon

-    get :view, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => create(:user) }
+    get :show, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => create(:user) }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :list
+    assert_redirected_to :action => :index

 
     # And finally we should be able to do it with the owner of the trace
 
     # And finally we should be able to do it with the owner of the trace

-    get :view, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => anon_trace_file.user }
-    check_trace_view anon_trace_file
+    get :show, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => anon_trace_file.user }
+    check_trace_show anon_trace_file

   end
 
   end
 

-  # Test viewing a trace that doesn't exist
-  def test_view_not_found
+  # Test showing a trace that doesn't exist
+  def test_show_not_found

     deleted_trace_file = create(:trace, :deleted)
 
     # First with a trace that has never existed
     deleted_trace_file = create(:trace, :deleted)
 
     # First with a trace that has never existed

-    get :view, :params => { :display_name => create(:user).display_name, :id => 0 }
+    get :show, :params => { :display_name => create(:user).display_name, :id => 0 }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :list
+    assert_redirected_to :action => :index

 
     # Now with a trace that has been deleted
 
     # Now with a trace that has been deleted

-    get :view, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
+    get :show, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :list
+    assert_redirected_to :action => :index

   end
 
   # Test downloading a trace
   end
 
   # Test downloading a trace


@@ -513,7 +547,7 @@ class TracesControllerTest < ActionController::TestCase
     # First with no auth
     get :new
     assert_response :redirect
     # First with no auth
     get :new
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => new_trace_path
+    assert_redirected_to :controller => :users, :action => :login, :referer => new_trace_path

 
     # Now authenticated as a user with gps.trace.visibility set
     user = create(:user)
 
     # Now authenticated as a user with gps.trace.visibility set
     user = create(:user)


@@ -558,8 +592,8 @@ class TracesControllerTest < ActionController::TestCase
     assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
     post :create, :params => { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, :session => { :user => user }
     assert_response :redirect
     assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
     post :create, :params => { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, :session => { :user => user }
     assert_response :redirect

-    assert_redirected_to :action => :list, :display_name => user.display_name
-    assert_match /file has been uploaded/, flash[:notice]
+    assert_redirected_to :action => :index, :display_name => user.display_name
+    assert_match(/file has been uploaded/, flash[:notice])

     trace = Trace.order(:id => :desc).first
     assert_equal "a.gpx", trace.name
     assert_equal "New Trace", trace.description
     trace = Trace.order(:id => :desc).first
     assert_equal "a.gpx", trace.name
     assert_equal "New Trace", trace.description


@@ -594,7 +628,7 @@ class TracesControllerTest < ActionController::TestCase
     # First with no auth
     get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
     assert_response :redirect
     # First with no auth
     get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file.id)
+    assert_redirected_to :controller => :users, :action => :login, :referer => edit_trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file.id)

 
     # Now with some other user, which should fail
     get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
 
     # Now with some other user, which should fail
     get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }


@@ -613,34 +647,8 @@ class TracesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
     assert_response :success
   end
 

-  # Test fetching the edit page for a trace using POST
-  def test_edit_post_no_details
-    public_trace_file = create(:trace, :visibility => "public")
-    deleted_trace_file = create(:trace, :deleted)
-
-    # First with no auth
-    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
-    assert_response :forbidden
-
-    # Now with some other user, which should fail
-    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
-    assert_response :forbidden
-
-    # Now with a trace which doesn't exist
-    post :edit, :params => { :display_name => create(:user).display_name, :id => 0 }, :session => { :user => create(:user) }
-    assert_response :not_found
-
-    # Now with a trace which has been deleted
-    post :edit, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
-    assert_response :not_found
-
-    # Finally with a trace that we are allowed to edit
-    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
-    assert_response :success
-  end
-

   # Test saving edits to a trace
   # Test saving edits to a trace

-  def test_edit_post_with_details
+  def test_update

     public_trace_file = create(:trace, :visibility => "public")
     deleted_trace_file = create(:trace, :deleted)
 
     public_trace_file = create(:trace, :visibility => "public")
     deleted_trace_file = create(:trace, :deleted)
 


@@ -648,25 +656,25 @@ class TracesControllerTest < ActionController::TestCase
     new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" }
 
     # First with no auth
     new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" }
 
     # First with no auth

-    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }
+    put :update, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }

     assert_response :forbidden
 
     # Now with some other user, which should fail
     assert_response :forbidden
 
     # Now with some other user, which should fail

-    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, :session => { :user => create(:user) }
+    put :update, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, :session => { :user => create(:user) }

     assert_response :forbidden
 
     # Now with a trace which doesn't exist
     assert_response :forbidden
 
     # Now with a trace which doesn't exist

-    post :edit, :params => { :display_name => create(:user).display_name, :id => 0 }, :session => { :user => create(:user), :trace => new_details }
+    put :update, :params => { :display_name => create(:user).display_name, :id => 0 }, :session => { :user => create(:user), :trace => new_details }

     assert_response :not_found
 
     # Now with a trace which has been deleted
     assert_response :not_found
 
     # Now with a trace which has been deleted

-    post :edit, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id, :trace => new_details }, :session => { :user => deleted_trace_file.user }
+    put :update, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id, :trace => new_details }, :session => { :user => deleted_trace_file.user }

     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit
     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit

-    post :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, :session => { :user => public_trace_file.user }
+    put :update, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, :session => { :user => public_trace_file.user }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :view, :display_name => public_trace_file.user.display_name
+    assert_redirected_to :action => :show, :display_name => public_trace_file.user.display_name

     trace = Trace.find(public_trace_file.id)
     assert_equal new_details[:description], trace.description
     assert_equal new_details[:tagstring], trace.tagstring
     trace = Trace.find(public_trace_file.id)
     assert_equal new_details[:description], trace.description
     assert_equal new_details[:tagstring], trace.tagstring


@@ -697,7 +705,7 @@ class TracesControllerTest < ActionController::TestCase
     # Now with a trace that we are allowed to delete
     post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
     assert_response :redirect
     # Now with a trace that we are allowed to delete
     post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
     assert_response :redirect

-    assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name
+    assert_redirected_to :action => :index, :display_name => public_trace_file.user.display_name

     trace = Trace.find(public_trace_file.id)
     assert_equal false, trace.visible
 
     trace = Trace.find(public_trace_file.id)
     assert_equal false, trace.visible
 


@@ -707,7 +715,7 @@ class TracesControllerTest < ActionController::TestCase
 
     post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => admin }
     assert_response :redirect
 
     post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => admin }
     assert_response :redirect

-    assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name
+    assert_redirected_to :action => :index, :display_name => public_trace_file.user.display_name

     trace = Trace.find(public_trace_file.id)
     assert_equal false, trace.visible
   end
     trace = Trace.find(public_trace_file.id)
     assert_equal false, trace.visible
   end


@@ -921,32 +929,27 @@ class TracesControllerTest < ActionController::TestCase
     anon_trace_file = create(:trace, :visibility => "private")
 
     # First with no auth
     anon_trace_file = create(:trace, :visibility => "private")
 
     # First with no auth

-    content public_trace_file.to_xml
-    put :api_update, :params => { :id => public_trace_file.id }
+    put :api_update, :params => { :id => public_trace_file.id }, :body => public_trace_file.to_xml.to_s

     assert_response :unauthorized
 
     # Now with some other user, which should fail
     basic_authorization create(:user).display_name, "test"
     assert_response :unauthorized
 
     # Now with some other user, which should fail
     basic_authorization create(:user).display_name, "test"

-    content public_trace_file.to_xml
-    put :api_update, :params => { :id => public_trace_file.id }
+    put :api_update, :params => { :id => public_trace_file.id }, :body => public_trace_file.to_xml.to_s

     assert_response :forbidden
 
     # Now with a trace which doesn't exist
     basic_authorization create(:user).display_name, "test"
     assert_response :forbidden
 
     # Now with a trace which doesn't exist
     basic_authorization create(:user).display_name, "test"

-    content public_trace_file.to_xml
-    put :api_update, :params => { :id => 0 }
+    put :api_update, :params => { :id => 0 }, :body => public_trace_file.to_xml.to_s

     assert_response :not_found
 
     # Now with a trace which did exist but has been deleted
     basic_authorization deleted_trace_file.user.display_name, "test"
     assert_response :not_found
 
     # Now with a trace which did exist but has been deleted
     basic_authorization deleted_trace_file.user.display_name, "test"

-    content deleted_trace_file.to_xml
-    put :api_update, :params => { :id => deleted_trace_file.id }
+    put :api_update, :params => { :id => deleted_trace_file.id }, :body => deleted_trace_file.to_xml.to_s

     assert_response :not_found
 
     # Now try an update with the wrong ID
     basic_authorization public_trace_file.user.display_name, "test"
     assert_response :not_found
 
     # Now try an update with the wrong ID
     basic_authorization public_trace_file.user.display_name, "test"

-    content anon_trace_file.to_xml
-    put :api_update, :params => { :id => public_trace_file.id }
+    put :api_update, :params => { :id => public_trace_file.id }, :body => anon_trace_file.to_xml.to_s

     assert_response :bad_request,
                     "should not be able to update a trace with a different ID from the XML"
 
     assert_response :bad_request,
                     "should not be able to update a trace with a different ID from the XML"
 


@@ -955,8 +958,7 @@ class TracesControllerTest < ActionController::TestCase
     t = public_trace_file
     t.description = "Changed description"
     t.visibility = "private"
     t = public_trace_file
     t.description = "Changed description"
     t.visibility = "private"

-    content t.to_xml
-    put :api_update, :params => { :id => t.id }
+    put :api_update, :params => { :id => t.id }, :body => t.to_xml.to_s

     assert_response :success
     nt = Trace.find(t.id)
     assert_equal nt.description, t.description
     assert_response :success
     nt = Trace.find(t.id)
     assert_equal nt.description, t.description


@@ -969,8 +971,7 @@ class TracesControllerTest < ActionController::TestCase
     trace = tracetag.trace
     basic_authorization trace.user.display_name, "test"
 
     trace = tracetag.trace
     basic_authorization trace.user.display_name, "test"
 

-    content trace.to_xml
-    put :api_update, :params => { :id => trace.id }
+    put :api_update, :params => { :id => trace.id }, :body => trace.to_xml.to_s

     assert_response :success
 
     updated = Trace.find(trace.id)
     assert_response :success
 
     updated = Trace.find(trace.id)


@@ -1021,11 +1022,11 @@ class TracesControllerTest < ActionController::TestCase
         assert_select "description"
         assert_select "link"
         assert_select "image"
         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", :count => traces.length do |items|
+          traces.zip(items).each do |trace, item|

             assert_select item, "title", trace.name
             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, "link", "http://test.host/user/#{ERB::Util.u(trace.user.display_name)}/traces/#{trace.id}"
+            assert_select item, "guid", "http://test.host/user/#{ERB::Util.u(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
             assert_select item, "description"
             # assert_select item, "dc:creator", trace.user.display_name
             assert_select item, "pubDate", trace.timestamp.rfc822


@@ -1035,9 +1036,9 @@ class TracesControllerTest < ActionController::TestCase
     end
   end
 
     end
   end
 

-  def check_trace_list(traces)
+  def check_trace_index(traces)

     assert_response :success
     assert_response :success

-    assert_template "list"
+    assert_template "index"

 
     if !traces.empty?
       assert_select "table#trace_list tbody", :count => 1 do
 
     if !traces.empty?
       assert_select "table#trace_list tbody", :count => 1 do


@@ -1055,9 +1056,9 @@ class TracesControllerTest < ActionController::TestCase
     end
   end
 
     end
   end
 

-  def check_trace_view(trace)
+  def check_trace_show(trace)

     assert_response :success
     assert_response :success

-    assert_template "view"
+    assert_template "show"

 
     assert_select "table", :count => 1 do
       assert_select "td", /^#{Regexp.quote(trace.name)} /
 
     assert_select "table", :count => 1 do
       assert_select "td", /^#{Regexp.quote(trace.name)} /