X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6fe5d4210099e714586bdcb5e7447c321afdfdc4..b4d90ec7f4de168a332959f52965d632bedb96aa:/test/controllers/user_controller_test.rb

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 3e71ea06a..ffae32d0c 100644
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -20,6 +20,10 @@ class UserControllerTest < ActionController::TestCase
       { :path => "/api/0.6/user/gpx_files", :method => :get },
       { :controller => "user", :action => "api_gpx_files" }
     )
+    assert_routing(
+      { :path => "/api/0.6/users", :method => :get },
+      { :controller => "user", :action => "api_users" }
+    )
 
     assert_routing(
       { :path => "/login", :method => :get },
@@ -126,7 +130,7 @@ class UserControllerTest < ActionController::TestCase
 
     assert_routing(
       { :path => "/user/username", :method => :get },
-      { :controller => "user", :action => "view", :display_name => "username" }
+      { :controller => "user", :action => "show", :display_name => "username" }
     )
 
     assert_routing(
@@ -166,19 +170,19 @@ class UserControllerTest < ActionController::TestCase
 
     assert_routing(
       { :path => "/users", :method => :get },
-      { :controller => "user", :action => "list" }
+      { :controller => "user", :action => "index" }
     )
     assert_routing(
       { :path => "/users", :method => :post },
-      { :controller => "user", :action => "list" }
+      { :controller => "user", :action => "index" }
     )
     assert_routing(
       { :path => "/users/status", :method => :get },
-      { :controller => "user", :action => "list", :status => "status" }
+      { :controller => "user", :action => "index", :status => "status" }
     )
     assert_routing(
       { :path => "/users/status", :method => :post },
-      { :controller => "user", :action => "list", :status => "status" }
+      { :controller => "user", :action => "index", :status => "status" }
     )
   end
 
@@ -241,7 +245,7 @@ class UserControllerTest < ActionController::TestCase
     register_email = ActionMailer::Base.deliveries.first
 
     assert_equal register_email.to[0], user.email
-    assert_match /#{@url}/, register_email.body.to_s
+    assert_match(/#{@url}/, register_email.body.to_s)
 
     # Check the page
     assert_redirected_to :action => "confirm", :display_name => user.display_name
@@ -400,7 +404,7 @@ class UserControllerTest < ActionController::TestCase
     @request.cookies["_osm_session"] = user.display_name
     post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
     assert_redirected_to login_path
-    assert_match /Confirmed your account/, flash[:notice]
+    assert_match(/Confirmed your account/, flash[:notice])
   end
 
   def test_confirm_success_good_token_no_referer
@@ -423,7 +427,7 @@ class UserControllerTest < ActionController::TestCase
     @request.cookies["_osm_session"] = user.display_name
     post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token }
     assert_redirected_to login_path
-    assert_match /Confirmed your account/, flash[:notice]
+    assert_match(/Confirmed your account/, flash[:notice])
   end
 
   def test_confirm_success_no_token_with_referer
@@ -434,7 +438,7 @@ class UserControllerTest < ActionController::TestCase
     @request.cookies["_osm_session"] = user.display_name
     post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
     assert_redirected_to login_path(:referer => diary_new_path)
-    assert_match /Confirmed your account/, flash[:notice]
+    assert_match(/Confirmed your account/, flash[:notice])
   end
 
   def test_confirm_success_good_token_with_referer
@@ -457,7 +461,7 @@ class UserControllerTest < ActionController::TestCase
     @request.cookies["_osm_session"] = user.display_name
     post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token }
     assert_redirected_to login_path(:referer => diary_new_path)
-    assert_match /Confirmed your account/, flash[:notice]
+    assert_match(/Confirmed your account/, flash[:notice])
   end
 
   def test_confirm_expired_token
@@ -467,7 +471,7 @@ class UserControllerTest < ActionController::TestCase
     @request.cookies["_osm_session"] = user.display_name
     post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
     assert_redirected_to :action => "confirm"
-    assert_match /confirmation code has expired/, flash[:error]
+    assert_match(/confirmation code has expired/, flash[:error])
   end
 
   def test_confirm_already_confirmed
@@ -477,7 +481,7 @@ class UserControllerTest < ActionController::TestCase
     @request.cookies["_osm_session"] = user.display_name
     post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
     assert_redirected_to :action => "login"
-    assert_match /already been confirmed/, flash[:error]
+    assert_match(/already been confirmed/, flash[:error])
   end
 
   def test_confirm_resend_success
@@ -490,7 +494,7 @@ class UserControllerTest < ActionController::TestCase
 
     assert_response :redirect
     assert_redirected_to login_path
-    assert_match /sent a new confirmation/, flash[:notice]
+    assert_match(/sent a new confirmation/, flash[:notice])
 
     email = ActionMailer::Base.deliveries.last
 
@@ -537,7 +541,7 @@ class UserControllerTest < ActionController::TestCase
     post :confirm_email, :params => { :confirm_string => confirm_string }
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => user.display_name
-    assert_match /Confirmed your change of email address/, flash[:notice]
+    assert_match(/Confirmed your change of email address/, flash[:notice])
   end
 
   def test_confirm_email_already_confirmed
@@ -547,14 +551,14 @@ class UserControllerTest < ActionController::TestCase
     post :confirm_email, :params => { :confirm_string => confirm_string }
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => user.display_name
-    assert_match /already been confirmed/, flash[:error]
+    assert_match(/already been confirmed/, flash[:error])
   end
 
   def test_confirm_email_bad_token
     post :confirm_email, :params => { :confirm_string => "XXXXX" }
     assert_response :success
     assert_template :confirm_email
-    assert_match /confirmation code has expired or does not exist/, flash[:error]
+    assert_match(/confirmation code has expired or does not exist/, flash[:error])
   end
 
   ##
@@ -567,11 +571,11 @@ class UserControllerTest < ActionController::TestCase
     stub_gravatar_request(user.new_email, 200)
     confirm_string = user.tokens.create.token
     # precondition gravatar should be turned off
-    assert !user.image_use_gravatar
+    assert_not user.image_use_gravatar
     post :confirm_email, :params => { :confirm_string => confirm_string }
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => user.display_name
-    assert_match /Confirmed your change of email address/, flash[:notice]
+    assert_match(/Confirmed your change of email address/, flash[:notice])
     # gravatar use should now be enabled
     assert User.find(user.id).image_use_gravatar
   end
@@ -586,9 +590,9 @@ class UserControllerTest < ActionController::TestCase
     post :confirm_email, :params => { :confirm_string => confirm_string }
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => user.display_name
-    assert_match /Confirmed your change of email address/, flash[:notice]
+    assert_match(/Confirmed your change of email address/, flash[:notice])
     # gravatar use should now be disabled
-    assert !User.find(user.id).image_use_gravatar
+    assert_not User.find(user.id).image_use_gravatar
   end
 
   def test_terms_new_user
@@ -674,7 +678,7 @@ class UserControllerTest < ActionController::TestCase
     end
     assert_response :redirect
     assert_redirected_to :action => :login
-    assert_match /^Sorry you lost it/, flash[:notice]
+    assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal user.email, email.to.first
@@ -687,7 +691,7 @@ class UserControllerTest < ActionController::TestCase
     end
     assert_response :redirect
     assert_redirected_to :action => :login
-    assert_match /^Sorry you lost it/, flash[:notice]
+    assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal uppercase_user.email, email.to.first
@@ -710,7 +714,7 @@ class UserControllerTest < ActionController::TestCase
     end
     assert_response :redirect
     assert_redirected_to :action => :login
-    assert_match /^Sorry you lost it/, flash[:notice]
+    assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal third_user.email, email.to.first
@@ -723,7 +727,7 @@ class UserControllerTest < ActionController::TestCase
     end
     assert_response :redirect
     assert_redirected_to :action => :login
-    assert_match /^Sorry you lost it/, flash[:notice]
+    assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal third_user.email, email.to.first
@@ -749,6 +753,12 @@ class UserControllerTest < ActionController::TestCase
     assert_response :success
     assert_template :reset_password
 
+    # Test that errors are reported for erroneous submissions
+    post :reset_password, :params => { :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "different_password" } }
+    assert_response :success
+    assert_template :reset_password
+    assert_select "div#errorExplanation"
+
     # Test setting a new password
     post :reset_password, :params => { :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" } }
     assert_response :redirect
@@ -772,7 +782,7 @@ class UserControllerTest < ActionController::TestCase
     # you are not logged in
     get :account, :params => { :display_name => user.display_name }
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => "login", :referer => "/user/#{URI.encode(user.display_name)}/account"
+    assert_redirected_to :controller => :user, :action => "login", :referer => "/user/#{ERB::Util.u(user.display_name)}/account"
 
     # Make sure that you are blocked when not logged in as the right user
     get :account, :params => { :display_name => user.display_name }, :session => { :user => create(:user) }
@@ -782,6 +792,11 @@ class UserControllerTest < ActionController::TestCase
     get :account, :params => { :display_name => user.display_name }, :session => { :user => user }
     assert_response :success
     assert_template :account
+    assert_select "form#accountForm" do |form|
+      assert_equal "post", form.attr("method").to_s
+      assert_select "input[name='_method']", false
+      assert_equal "/user/#{ERB::Util.u(user.display_name)}/account", form.attr("action").to_s
+    end
 
     # Updating the description should work
     user.description = "new description"
@@ -848,7 +863,7 @@ class UserControllerTest < ActionController::TestCase
     # Adding external authentication should redirect to the auth provider
     post :account, :params => { :display_name => user.display_name, :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }, :session => { :user => user }
     assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "https://www.google.com/accounts/o8/id", :origin => "/user/#{URI.encode(user.display_name)}/account")
+    assert_redirected_to auth_path(:provider => "openid", :openid_url => "https://www.google.com/accounts/o8/id", :origin => "/user/#{ERB::Util.u(user.display_name)}/account")
 
     # Changing name to one that exists should fail
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name)
@@ -920,90 +935,99 @@ class UserControllerTest < ActionController::TestCase
 
   # Check that the user account page will display and contains some relevant
   # information for the user
-  def test_view
+  def test_show
     # Test a non-existent user
-    get :view, :params => { :display_name => "unknown" }
+    get :show, :params => { :display_name => "unknown" }
     assert_response :not_found
 
     # Test a normal user
     user = create(:user)
-    get :view, :params => { :display_name => user.display_name }
+    create(:friend, :befriender => user)
+    get :show, :params => { :display_name => user.display_name }
     assert_response :success
     assert_select "div#userinformation" do
-      assert_select "a[href^='/user/#{URI.encode(user.display_name)}/history']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/traces']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/diary']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/diary/comments']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/account']", 0
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/blocks']", 0
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/blocks_by']", 0
-      assert_select "a[href='/blocks/new/#{URI.encode(user.display_name)}']", 0
+      assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/account']", 0
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0
+      assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0
     end
 
+    # Friends shouldn't be visible as we're not logged in
+    assert_select "div#friends-container", :count => 0
+
     # Test a user who has been blocked
     blocked_user = create(:user)
     create(:user_block, :user => blocked_user)
-    get :view, :params => { :display_name => blocked_user.display_name }
+    get :show, :params => { :display_name => blocked_user.display_name }
     assert_response :success
     assert_select "div#userinformation" do
-      assert_select "a[href^='/user/#{URI.encode(blocked_user.display_name)}/history']", 1
-      assert_select "a[href='/user/#{URI.encode(blocked_user.display_name)}/traces']", 1
-      assert_select "a[href='/user/#{URI.encode(blocked_user.display_name)}/diary']", 1
-      assert_select "a[href='/user/#{URI.encode(blocked_user.display_name)}/diary/comments']", 1
-      assert_select "a[href='/user/#{URI.encode(blocked_user.display_name)}/account']", 0
-      assert_select "a[href='/user/#{URI.encode(blocked_user.display_name)}/blocks']", 1
-      assert_select "a[href='/user/#{URI.encode(blocked_user.display_name)}/blocks_by']", 0
-      assert_select "a[href='/blocks/new/#{URI.encode(blocked_user.display_name)}']", 0
+      assert_select "a[href^='/user/#{ERB::Util.u(blocked_user.display_name)}/history']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/traces']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary/comments']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/account']", 0
+      assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/blocks']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/blocks_by']", 0
+      assert_select "a[href='/blocks/new/#{ERB::Util.u(blocked_user.display_name)}']", 0
     end
 
     # Test a moderator who has applied blocks
     moderator_user = create(:moderator_user)
     create(:user_block, :creator => moderator_user)
-    get :view, :params => { :display_name => moderator_user.display_name }
+    get :show, :params => { :display_name => moderator_user.display_name }
     assert_response :success
     assert_select "div#userinformation" do
-      assert_select "a[href^='/user/#{URI.encode(moderator_user.display_name)}/history']", 1
-      assert_select "a[href='/user/#{URI.encode(moderator_user.display_name)}/traces']", 1
-      assert_select "a[href='/user/#{URI.encode(moderator_user.display_name)}/diary']", 1
-      assert_select "a[href='/user/#{URI.encode(moderator_user.display_name)}/diary/comments']", 1
-      assert_select "a[href='/user/#{URI.encode(moderator_user.display_name)}/account']", 0
-      assert_select "a[href='/user/#{URI.encode(moderator_user.display_name)}/blocks']", 0
-      assert_select "a[href='/user/#{URI.encode(moderator_user.display_name)}/blocks_by']", 1
-      assert_select "a[href='/blocks/new/#{URI.encode(moderator_user.display_name)}']", 0
+      assert_select "a[href^='/user/#{ERB::Util.u(moderator_user.display_name)}/history']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/traces']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary/comments']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/account']", 0
+      assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/blocks']", 0
+      assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/blocks_by']", 1
+      assert_select "a[href='/blocks/new/#{ERB::Util.u(moderator_user.display_name)}']", 0
     end
 
     # Login as a normal user
     session[:user] = user.id
 
     # Test the normal user
-    get :view, :params => { :display_name => user.display_name }
+    get :show, :params => { :display_name => user.display_name }
     assert_response :success
     assert_select "div#userinformation" do
-      assert_select "a[href^='/user/#{URI.encode(user.display_name)}/history']", 1
+      assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
       assert_select "a[href='/traces/mine']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/diary']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/diary/comments']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/account']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/blocks']", 0
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/blocks_by']", 0
-      assert_select "a[href='/blocks/new/#{URI.encode(user.display_name)}']", 0
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/account']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0
+      assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0
+    end
+
+    # Friends should be visible as we're now logged in
+    assert_select "div#friends-container" do
+      assert_select "div.contact-activity", :count => 1
     end
 
     # Login as a moderator
     session[:user] = create(:moderator_user).id
 
     # Test the normal user
-    get :view, :params => { :display_name => user.display_name }
+    get :show, :params => { :display_name => user.display_name }
     assert_response :success
     assert_select "div#userinformation" do
-      assert_select "a[href^='/user/#{URI.encode(user.display_name)}/history']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/traces']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/diary']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/diary/comments']", 1
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/account']", 0
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/blocks']", 0
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/blocks_by']", 0
-      assert_select "a[href='/blocks/new/#{URI.encode(user.display_name)}']", 1
+      assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/account']", 0
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0
+      assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 1
     end
   end
 
@@ -1013,13 +1037,13 @@ class UserControllerTest < ActionController::TestCase
     seen_user = create(:user, :terms_seen => true)
     not_seen_user = create(:user, :terms_seen => false)
 
-    get :view, :params => { :display_name => agreed_user.display_name }
+    get :show, :params => { :display_name => agreed_user.display_name }
     assert_response :success
     assert_select "div#userinformation" do
       assert_select "p", :count => 0, :text => /Contributor terms/
     end
 
-    get :view, :params => { :display_name => seen_user.display_name }
+    get :show, :params => { :display_name => seen_user.display_name }
     assert_response :success
     # put @response.body
     assert_select "div#userinformation" do
@@ -1027,7 +1051,7 @@ class UserControllerTest < ActionController::TestCase
       assert_select "p", /Declined/
     end
 
-    get :view, :params => { :display_name => not_seen_user.display_name }
+    get :show, :params => { :display_name => not_seen_user.display_name }
     assert_response :success
     assert_select "div#userinformation" do
       assert_select "p", :count => 1, :text => /Contributor terms/
@@ -1135,6 +1159,48 @@ class UserControllerTest < ActionController::TestCase
     end
   end
 
+  def test_api_users
+    user1 = create(:user, :description => "test1", :terms_agreed => Date.yesterday)
+    user2 = create(:user, :description => "test2", :terms_agreed => Date.yesterday)
+    user3 = create(:user, :description => "test3", :terms_agreed => Date.yesterday)
+
+    get :api_users, :params => { :users => user1.id }
+    assert_response :success
+    assert_equal "text/xml", response.content_type
+    assert_select "user", :count => 1 do
+      assert_select "user[id='#{user1.id}']", :count => 1
+      assert_select "user[id='#{user2.id}']", :count => 0
+      assert_select "user[id='#{user3.id}']", :count => 0
+    end
+
+    get :api_users, :params => { :users => user2.id }
+    assert_response :success
+    assert_equal "text/xml", response.content_type
+    assert_select "user", :count => 1 do
+      assert_select "user[id='#{user1.id}']", :count => 0
+      assert_select "user[id='#{user2.id}']", :count => 1
+      assert_select "user[id='#{user3.id}']", :count => 0
+    end
+
+    get :api_users, :params => { :users => "#{user1.id},#{user3.id}" }
+    assert_response :success
+    assert_equal "text/xml", response.content_type
+    assert_select "user", :count => 2 do
+      assert_select "user[id='#{user1.id}']", :count => 1
+      assert_select "user[id='#{user2.id}']", :count => 0
+      assert_select "user[id='#{user3.id}']", :count => 1
+    end
+
+    get :api_users, :params => { :users => create(:user, :suspended).id }
+    assert_response :not_found
+
+    get :api_users, :params => { :users => create(:user, :deleted).id }
+    assert_response :not_found
+
+    get :api_users, :params => { :users => 0 }
+    assert_response :not_found
+  end
+
   def test_api_gpx_files
     user = create(:user)
     trace1 = create(:trace, :user => user) do |trace|
@@ -1193,8 +1259,8 @@ class UserControllerTest < ActionController::TestCase
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
     end
-    assert_redirected_to user_path(:display_name => friend.display_name)
-    assert_match /is now your friend/, flash[:notice]
+    assert_redirected_to user_path(friend)
+    assert_match(/is now your friend/, flash[:notice])
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
@@ -1205,8 +1271,8 @@ class UserControllerTest < ActionController::TestCase
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
     end
-    assert_redirected_to user_path(:display_name => friend.display_name)
-    assert_match /You are already friends with/, flash[:warning]
+    assert_redirected_to user_path(friend)
+    assert_match(/You are already friends with/, flash[:warning])
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
   end
 
@@ -1233,7 +1299,7 @@ class UserControllerTest < ActionController::TestCase
       post :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
     end
     assert_redirected_to "/test"
-    assert_match /is now your friend/, flash[:notice]
+    assert_match(/is now your friend/, flash[:notice])
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
@@ -1278,14 +1344,14 @@ class UserControllerTest < ActionController::TestCase
 
     # When logged in a POST should remove the friendship
     post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
-    assert_redirected_to user_path(:display_name => friend.display_name)
-    assert_match /was removed from your friends/, flash[:notice]
+    assert_redirected_to user_path(friend)
+    assert_match(/was removed from your friends/, flash[:notice])
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # A second POST should report that the friendship does not exist
     post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
-    assert_redirected_to user_path(:display_name => friend.display_name)
-    assert_match /is not one of your friends/, flash[:error]
+    assert_redirected_to user_path(friend)
+    assert_match(/is not one of your friends/, flash[:error])
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
   end
 
@@ -1311,7 +1377,7 @@ class UserControllerTest < ActionController::TestCase
     # When logged in a POST should remove the friendship and refer
     post :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
     assert_redirected_to "/test"
-    assert_match /was removed from your friends/, flash[:notice]
+    assert_match(/was removed from your friends/, flash[:notice])
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
   end
 
@@ -1333,12 +1399,12 @@ class UserControllerTest < ActionController::TestCase
     # Now try as a normal user
     get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => user.display_name
+    assert_redirected_to :action => :show, :display_name => user.display_name
 
     # Finally try as an administrator
     get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => user.display_name
+    assert_redirected_to :action => :show, :display_name => user.display_name
     assert_equal "suspended", User.find(user.id).status
   end
 
@@ -1353,12 +1419,12 @@ class UserControllerTest < ActionController::TestCase
     # Now try as a normal user
     get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => user.display_name
+    assert_redirected_to :action => :show, :display_name => user.display_name
 
     # Finally try as an administrator
     get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => user.display_name
+    assert_redirected_to :action => :show, :display_name => user.display_name
 
     # Check that the user was deleted properly
     user.reload
@@ -1374,7 +1440,7 @@ class UserControllerTest < ActionController::TestCase
     assert_equal "deleted", user.status
   end
 
-  def test_list_get
+  def test_index_get
     user = create(:user)
     moderator_user = create(:moderator_user)
     administrator_user = create(:administrator_user)
@@ -1386,21 +1452,21 @@ class UserControllerTest < ActionController::TestCase
     assert_equal 7, User.count
 
     # Shouldn't work when not logged in
-    get :list
+    get :index
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
 
     session[:user] = user.id
 
     # Shouldn't work when logged in as a normal user
-    get :list
+    get :index
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
 
     session[:user] = moderator_user.id
 
     # Shouldn't work when logged in as a moderator
-    get :list
+    get :index
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
 
@@ -1408,25 +1474,25 @@ class UserControllerTest < ActionController::TestCase
 
     # Note there is a header row, so all row counts are users + 1
     # Should work when logged in as an administrator
-    get :list
+    get :index
     assert_response :success
-    assert_template :list
+    assert_template :index
     assert_select "table#user_list tr", :count => 7 + 1
 
     # Should be able to limit by status
-    get :list, :params => { :status => "suspended" }
+    get :index, :params => { :status => "suspended" }
     assert_response :success
-    assert_template :list
+    assert_template :index
     assert_select "table#user_list tr", :count => 1 + 1
 
     # Should be able to limit by IP address
-    get :list, :params => { :ip => "1.2.3.4" }
+    get :index, :params => { :ip => "1.2.3.4" }
     assert_response :success
-    assert_template :list
+    assert_template :index
     assert_select "table#user_list tr", :count => 1 + 1
   end
 
-  def test_list_get_paginated
+  def test_index_get_paginated
     1.upto(100).each do |n|
       User.create(:display_name => "extra_#{n}",
                   :email => "extra#{n}@example.com",
@@ -1438,29 +1504,29 @@ class UserControllerTest < ActionController::TestCase
     # 100 examples, an administrator, and a granter for the admin.
     assert_equal 102, User.count
 
-    get :list
+    get :index
     assert_response :success
-    assert_template :list
+    assert_template :index
     assert_select "table#user_list tr", :count => 51
 
-    get :list, :params => { :page => 2 }
+    get :index, :params => { :page => 2 }
     assert_response :success
-    assert_template :list
+    assert_template :index
     assert_select "table#user_list tr", :count => 51
 
-    get :list, :params => { :page => 3 }
+    get :index, :params => { :page => 3 }
     assert_response :success
-    assert_template :list
+    assert_template :index
     assert_select "table#user_list tr", :count => 3
   end
 
-  def test_list_post_confirm
+  def test_index_post_confirm
     inactive_user = create(:user, :pending)
     suspended_user = create(:user, :suspended)
 
     # Shouldn't work when not logged in
     assert_no_difference "User.active.count" do
-      post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+      post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
@@ -1471,7 +1537,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Shouldn't work when logged in as a normal user
     assert_no_difference "User.active.count" do
-      post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+      post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
@@ -1482,7 +1548,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Shouldn't work when logged in as a moderator
     assert_no_difference "User.active.count" do
-      post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+      post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
@@ -1493,21 +1559,21 @@ class UserControllerTest < ActionController::TestCase
 
     # Should work when logged in as an administrator
     assert_difference "User.active.count", 2 do
-      post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+      post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end
     assert_response :redirect
-    assert_redirected_to :action => :list
+    assert_redirected_to :action => :index
     assert_equal "confirmed", inactive_user.reload.status
     assert_equal "confirmed", suspended_user.reload.status
   end
 
-  def test_list_post_hide
+  def test_index_post_hide
     normal_user = create(:user)
     confirmed_user = create(:user, :confirmed)
 
     # Shouldn't work when not logged in
     assert_no_difference "User.active.count" do
-      post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+      post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
@@ -1518,7 +1584,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Shouldn't work when logged in as a normal user
     assert_no_difference "User.active.count" do
-      post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+      post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
@@ -1529,7 +1595,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Shouldn't work when logged in as a moderator
     assert_no_difference "User.active.count" do
-      post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+      post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
@@ -1540,10 +1606,10 @@ class UserControllerTest < ActionController::TestCase
 
     # Should work when logged in as an administrator
     assert_difference "User.active.count", -2 do
-      post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+      post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end
     assert_response :redirect
-    assert_redirected_to :action => :list
+    assert_redirected_to :action => :index
     assert_equal "deleted", normal_user.reload.status
     assert_equal "deleted", confirmed_user.reload.status
   end