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

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

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index a39e07efcc0c68b2e42bb8a03b4e877678a85735..e149b83c7bfd79726e2f24ef3c2db1a045938efc 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -1,8 +1,10 @@
-require 'test_helper'
+require "test_helper"

 
 class UserControllerTest < ActionController::TestCase
 
 class UserControllerTest < ActionController::TestCase

-  fixtures :users
-  
+  def setup
+    stub_hostip_requests
+  end
+

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -181,12 +183,12 @@ class UserControllerTest < ActionController::TestCase
   end
 
   # The user creation page loads
   end
 
   # The user creation page loads

-  def test_user_create_view
+  def test_new_view

     get :new
     assert_response :redirect
     assert_redirected_to user_new_path(:cookie_test => "true")
 
     get :new
     assert_response :redirect
     assert_redirected_to user_new_path(:cookie_test => "true")
 

-    get :new, { :cookie_test => "true" }, { :cookie_test => true }
+    get :new, :params => { :cookie_test => "true" }, :session => { :cookie_test => true }

     assert_response :success
 
     assert_select "html", :count => 1 do
     assert_response :success
 
     assert_select "html", :count => 1 do


@@ -195,36 +197,43 @@ class UserControllerTest < ActionController::TestCase
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do

-          assert_select "form[action='/user/new'][method=post]", :count => 1 do
-            assert_select "input[id=user_email]", :count => 1
-            assert_select "input[id=user_email_confirmation]", :count => 1
-            assert_select "input[id=user_display_name]", :count => 1
-            assert_select "input[id=user_pass_crypt][type=password]", :count => 1
-            assert_select "input[id=user_pass_crypt_confirmation][type=password]", :count => 1
-            assert_select "input[type=submit][value=Sign Up]", :count => 1
+          assert_select "form[action='/user/new'][method='post']", :count => 1 do
+            assert_select "input[id='user_email']", :count => 1
+            assert_select "input[id='user_email_confirmation']", :count => 1
+            assert_select "input[id='user_display_name']", :count => 1
+            assert_select "input[id='user_pass_crypt'][type='password']", :count => 1
+            assert_select "input[id='user_pass_crypt_confirmation'][type='password']", :count => 1
+            assert_select "input[type='submit'][value='Sign Up']", :count => 1

           end
         end
       end
     end
   end
 
           end
         end
       end
     end
   end
 

-  def new_user
-    user = User.new
-    user.status = "pending"
-    user.display_name = "new_tester"
-    user.email = "newtester@osm.org"
-    user.email_confirmation = "newtester@osm.org"
-    user.pass_crypt = "testtest"
-    user.pass_crypt_confirmation = "testtest"
-    user
+  def test_new_view_logged_in
+    session[:user] = create(:user).id
+
+    get :new
+    assert_response :redirect
+    assert_redirected_to user_new_path(:cookie_test => "true")
+    get :new, :params => { :cookie_test => "true" }
+    assert_response :redirect
+    assert_redirected_to root_path
+
+    get :new, :params => { :referer => "/test" }
+    assert_response :redirect
+    assert_redirected_to user_new_path(:referer => "/test", :cookie_test => "true")
+    get :new, :params => { :referer => "/test", :cookie_test => "true" }
+    assert_response :redirect
+    assert_redirected_to "/test"

   end
 
   end
 

-  def test_user_create_success
-    user = new_user
+  def test_new_success
+    user = build(:user, :pending)

 
 

-    assert_difference('User.count', 1) do
-      assert_difference('ActionMailer::Base.deliveries.size', 1) do
-        post :save, {}, {:new_user => user}
+    assert_difference "User.count", 1 do
+      assert_difference "ActionMailer::Base.deliveries.size", 1 do
+        post :save, :session => { :new_user => user }

       end
     end
 
       end
     end
 


@@ -235,133 +244,420 @@ class UserControllerTest < ActionController::TestCase
     assert_match /#{@url}/, register_email.body.to_s
 
     # Check the page
     assert_match /#{@url}/, register_email.body.to_s
 
     # Check the page

-    assert_redirected_to :action => 'confirm', :display_name => user.display_name
+    assert_redirected_to :action => "confirm", :display_name => user.display_name

 
     ActionMailer::Base.deliveries.clear
   end
 
 
     ActionMailer::Base.deliveries.clear
   end
 

-  def test_user_create_submit_duplicate_email
-    user = new_user
-    user.email = users(:public_user).email
+  def test_new_duplicate_email
+    user = build(:user, :pending)
+    user.email = create(:user).email

 
 

-    assert_no_difference('User.count') do
-      assert_no_difference('ActionMailer::Base.deliveries.size') do
-        post :save, {}, {:new_user => user}
+    assert_no_difference "User.count" do
+      assert_no_difference "ActionMailer::Base.deliveries.size" do
+        post :save, :session => { :new_user => user }

       end
     end
 
     assert_response :success
       end
     end
 
     assert_response :success

-    assert_template 'new'
+    assert_template "new"

     assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
   end
 
     assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
   end
 

-  def test_user_create_submit_duplicate_email_uppercase
-    user = new_user
-    user.email = users(:public_user).email.upcase
+  def test_new_duplicate_email_uppercase
+    user = build(:user, :pending)
+    user.email = create(:user).email.upcase

 
 

-    assert_no_difference('User.count') do
-      assert_no_difference('ActionMailer::Base.deliveries.size') do
-        post :save, {}, {:new_user => user}
+    assert_no_difference "User.count" do
+      assert_no_difference "ActionMailer::Base.deliveries.size" do
+        post :save, :session => { :new_user => user }

       end
     end
 
     assert_response :success
       end
     end
 
     assert_response :success

-    assert_template 'new'
+    assert_template "new"

     assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
   end
     assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
   end

-    
-  def test_user_create_submit_duplicate_name
-    user = new_user
-    user.display_name = users(:public_user).display_name

 
 

-    assert_no_difference('User.count') do
-      assert_no_difference('ActionMailer::Base.deliveries.size') do
-        post :save, {}, {:new_user => user}
+  def test_new_duplicate_name
+    user = build(:user, :pending)
+    user.display_name = create(:user).display_name
+
+    assert_no_difference "User.count" do
+      assert_no_difference "ActionMailer::Base.deliveries.size" do
+        post :save, :session => { :new_user => user }

       end
     end
 
     assert_response :success
       end
     end
 
     assert_response :success

-    assert_template 'new'
+    assert_template "new"

     assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
   end
     assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
   end

-  
-  def test_user_create_submit_duplicate_name_uppercase
-    user = new_user
-    user.display_name = users(:public_user).display_name.upcase

 
 

-    assert_no_difference('User.count') do
-      assert_no_difference('ActionMailer::Base.deliveries.size') do
-        post :save, {}, {:new_user => user}
+  def test_new_duplicate_name_uppercase
+    user = build(:user, :pending)
+    user.display_name = create(:user).display_name.upcase
+
+    assert_no_difference "User.count" do
+      assert_no_difference "ActionMailer::Base.deliveries.size" do
+        post :save, :session => { :new_user => user }

       end
     end
 
     assert_response :success
       end
     end
 
     assert_response :success

-    assert_template 'new'
+    assert_template "new"

     assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
   end
 
     assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
   end
 

-  def test_user_save_referer_params
-    user = new_user
+  def test_save_referer_params
+    user = build(:user, :pending)

 
 

-    assert_difference('User.count', 1) do
-      assert_difference('ActionMailer::Base.deliveries.size', 1) do
-        post :save, {}, {:new_user => user,
-                         :referer => '/edit?editor=id#map=1/2/3'}
-        end
+    assert_difference "User.count", 1 do
+      assert_difference "ActionMailer::Base.deliveries.size", 1 do
+        post :save, :session => { :new_user => user,
+                                  :referer => "/edit?editor=id#map=1/2/3" }
+      end

     end
 
     end
 

-    assert_equal welcome_path(:editor => 'id', :zoom => 1, :lat => 2, :lon => 3),
+    assert_equal welcome_path(:editor => "id", :zoom => 1, :lat => 2, :lon => 3),

                  user.tokens.order("id DESC").first.referer
 
     ActionMailer::Base.deliveries.clear
   end
 
                  user.tokens.order("id DESC").first.referer
 
     ActionMailer::Base.deliveries.clear
   end
 

-  def test_user_confirm_expired_token
-    user = users(:inactive_user)
-    token = user.tokens.new
-    token.expiry = 1.day.ago
-    token.save!
+  def test_logout_without_referer
+    get :logout
+    assert_response :success
+    assert_template :logout
+    assert_select "input[name=referer][value=?]", ""
+
+    session_id = assert_select("input[name=session]").first["value"]
+
+    get :logout, :params => { :session => session_id }
+    assert_response :redirect
+    assert_redirected_to root_path
+  end
+
+  def test_logout_with_referer
+    get :logout, :params => { :referer => "/test" }
+    assert_response :success
+    assert_template :logout
+    assert_select "input[name=referer][value=?]", "/test"
+
+    session_id = assert_select("input[name=session]").first["value"]
+
+    get :logout, :params => { :session => session_id, :referer => "/test" }
+    assert_response :redirect
+    assert_redirected_to "/test"
+  end
+
+  def test_logout_with_token
+    token = create(:user).tokens.create
+
+    session[:token] = token.token
+
+    get :logout
+    assert_response :success
+    assert_template :logout
+    assert_select "input[name=referer][value=?]", ""
+    assert_equal token.token, session[:token]
+    assert_not_nil UserToken.where(:id => token.id).first
+
+    session_id = assert_select("input[name=session]").first["value"]
+
+    get :logout, :params => { :session => session_id }
+    assert_response :redirect
+    assert_redirected_to root_path
+    assert_nil session[:token]
+    assert_nil UserToken.where(:id => token.id).first
+  end
+
+  def test_confirm_get
+    user = create(:user, :pending)
+    confirm_string = user.tokens.create.token

 
     @request.cookies["_osm_session"] = user.display_name
 
     @request.cookies["_osm_session"] = user.display_name

-    post :confirm, :confirm_string => token.token
+    get :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
+    assert_response :success
+    assert_template :confirm
+  end
+
+  def test_confirm_get_already_confirmed
+    user = create(:user)
+    confirm_string = user.tokens.create.token

 
 

-    assert_redirected_to :action => 'confirm'
-    assert_match /expired/, flash[:error]
+    @request.cookies["_osm_session"] = user.display_name
+    get :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
+    assert_response :redirect
+    assert_redirected_to root_path

   end
 
   end
 

-  def test_user_already_confirmed
-    user = users(:normal_user)
-    token = user.tokens.create
+  def test_confirm_success_no_token_no_referer
+    user = create(:user, :pending)
+    stub_gravatar_request(user.email)
+    confirm_string = user.tokens.create.token

 
     @request.cookies["_osm_session"] = user.display_name
 
     @request.cookies["_osm_session"] = user.display_name

-    post :confirm, :confirm_string => token.token
+    post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
+    assert_redirected_to login_path
+    assert_match /Confirmed your account/, flash[:notice]
+  end
+
+  def test_confirm_success_good_token_no_referer
+    user = create(:user, :pending)
+    stub_gravatar_request(user.email)
+    confirm_string = user.tokens.create.token
+    token = user.tokens.create.token
+
+    @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 welcome_path
+  end
+
+  def test_confirm_success_bad_token_no_referer
+    user = create(:user, :pending)
+    stub_gravatar_request(user.email)
+    confirm_string = user.tokens.create.token
+    token = create(:user).tokens.create.token
+
+    @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]
+  end
+
+  def test_confirm_success_no_token_with_referer
+    user = create(:user, :pending)
+    stub_gravatar_request(user.email)
+    confirm_string = user.tokens.create(:referer => diary_new_path).token
+
+    @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]
+  end
+
+  def test_confirm_success_good_token_with_referer
+    user = create(:user, :pending)
+    stub_gravatar_request(user.email)
+    confirm_string = user.tokens.create(:referer => diary_new_path).token
+    token = user.tokens.create.token
+
+    @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 diary_new_path
+  end
+
+  def test_confirm_success_bad_token_with_referer
+    user = create(:user, :pending)
+    stub_gravatar_request(user.email)
+    confirm_string = user.tokens.create(:referer => diary_new_path).token
+    token = create(:user).tokens.create.token
+
+    @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]
+  end
+
+  def test_confirm_expired_token
+    user = create(:user, :pending)
+    confirm_string = user.tokens.create(:expiry => 1.day.ago).token
+
+    @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]
+  end
+
+  def test_confirm_already_confirmed
+    user = create(:user)
+    confirm_string = user.tokens.create(:referer => diary_new_path).token
+
+    @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]
+  end
+
+  def test_confirm_resend_success
+    user = create(:user, :pending)
+    session[:token] = user.tokens.create.token
+
+    assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      get :confirm_resend, :params => { :display_name => user.display_name }
+    end
+
+    assert_response :redirect
+    assert_redirected_to login_path
+    assert_match /sent a new confirmation/, flash[:notice]
+
+    email = ActionMailer::Base.deliveries.last
+
+    assert_equal user.email, email.to.first
+
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def test_confirm_resend_no_token
+    user = create(:user, :pending)
+    assert_no_difference "ActionMailer::Base.deliveries.size" do
+      get :confirm_resend, :params => { :display_name => user.display_name }
+    end
+
+    assert_response :redirect
+    assert_redirected_to login_path
+    assert_match "User #{user.display_name} not found.", flash[:error]
+  end
+
+  def test_confirm_resend_unknown_user
+    assert_no_difference "ActionMailer::Base.deliveries.size" do
+      get :confirm_resend, :params => { :display_name => "No Such User" }
+    end
+
+    assert_response :redirect
+    assert_redirected_to login_path
+    assert_match "User No Such User not found.", flash[:error]
+  end
+
+  def test_confirm_email_get
+    user = create(:user)
+    confirm_string = user.tokens.create.token
+
+    get :confirm_email, :params => { :confirm_string => confirm_string }
+    assert_response :success
+    assert_template :confirm_email
+  end
+
+  def test_confirm_email_success
+    user = create(:user, :new_email => "test-new@example.com")
+    stub_gravatar_request(user.new_email)
+    confirm_string = user.tokens.create.token
+
+    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]
+  end
+
+  def test_confirm_email_already_confirmed
+    user = create(:user)
+    confirm_string = user.tokens.create.token
+
+    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]
+  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]
+  end

 
 

-    assert_redirected_to :action => 'login'
-    assert_match /confirmed/, flash[:error]
+  ##
+  # test if testing for a gravatar works
+  # this happens when the email is actually changed
+  # which is triggered by the confirmation mail
+  def test_gravatar_auto_enable
+    # switch to email that has a gravatar
+    user = create(:user, :new_email => "test-new@example.com")
+    stub_gravatar_request(user.new_email, 200)
+    confirm_string = user.tokens.create.token
+    # precondition gravatar should be turned off
+    assert !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]
+    # gravatar use should now be enabled
+    assert User.find(user.id).image_use_gravatar

   end
 
   end
 

-  def test_user_terms_new_user
-    get :terms, {}, { "new_user" => User.new }
+  def test_gravatar_auto_disable
+    # switch to email without a gravatar
+    user = create(:user, :new_email => "test-new@example.com", :image_use_gravatar => true)
+    stub_gravatar_request(user.new_email, 404)
+    confirm_string = user.tokens.create.token
+    # precondition gravatar should be turned on
+    assert 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]
+    # gravatar use should now be disabled
+    assert !User.find(user.id).image_use_gravatar
+  end
+
+  def test_terms_new_user
+    get :terms, :session => { :new_user => User.new }

     assert_response :success
     assert_template :terms
   end
 
     assert_response :success
     assert_template :terms
   end
 

-  def test_user_terms_seen
-    user = users(:normal_user)
+  def test_terms_agreed
+    user = create(:user, :terms_seen => true, :terms_agreed => Date.yesterday)

 
 

-    get :terms, {}, { "user" => user }
+    session[:user] = user.id
+
+    get :terms

     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => user.display_name
   end
 
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => user.display_name
   end
 

-  def test_user_go_public
-    post :go_public, {}, { :user => users(:normal_user) }
+  def test_terms_not_seen_without_referer
+    user = create(:user, :terms_seen => false)
+
+    session[:user] = user.id
+
+    get :terms
+    assert_response :success
+    assert_template :terms
+
+    post :save, :params => { :user => { :consider_pd => true } }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :account, :display_name => users(:normal_user).display_name
-    assert_equal true, User.find(users(:normal_user).id).data_public
+    assert_redirected_to :action => :account, :display_name => user.display_name
+    assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
+
+    user.reload
+
+    assert_equal true, user.consider_pd
+    assert_not_nil user.terms_agreed
+    assert_equal true, user.terms_seen

   end
 
   end
 

-  def test_user_lost_password
+  def test_terms_not_seen_with_referer
+    user = create(:user, :terms_seen => false)
+
+    session[:user] = user.id
+
+    get :terms, :params => { :referer => "/test" }
+    assert_response :success
+    assert_template :terms
+
+    post :save, :params => { :user => { :consider_pd => true }, :referer => "/test" }
+    assert_response :redirect
+    assert_redirected_to "/test"
+    assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
+
+    user.reload
+
+    assert_equal true, user.consider_pd
+    assert_not_nil user.terms_agreed
+    assert_equal true, user.terms_seen
+  end
+
+  def test_go_public
+    user = create(:user, :data_public => false)
+    post :go_public, :session => { :user => user }
+    assert_response :redirect
+    assert_redirected_to :action => :account, :display_name => user.display_name
+    assert_equal true, User.find(user.id).data_public
+  end
+
+  def test_lost_password

     # Test fetching the lost password page
     get :lost_password
     assert_response :success
     # Test fetching the lost password page
     get :lost_password
     assert_response :success


@@ -370,34 +666,37 @@ class UserControllerTest < ActionController::TestCase
 
     # Test resetting using the address as recorded for a user that has an
     # address which is duplicated in a different case by another user
 
     # Test resetting using the address as recorded for a user that has an
     # address which is duplicated in a different case by another user

-    assert_difference('ActionMailer::Base.deliveries.size', 1) do
-      post :lost_password, :user => { :email => users(:normal_user).email }
+    user = create(:user)
+    uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) }
+
+    assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      post :lost_password, :params => { :user => { :email => user.email } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match /^Sorry you lost it/, flash[:notice]
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match /^Sorry you lost it/, flash[:notice]
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count

-    assert_equal users(:normal_user).email, email.to.first
+    assert_equal user.email, email.to.first

     ActionMailer::Base.deliveries.clear
 
     # Test resetting using an address that matches a different user
     # that has the same address in a different case
     ActionMailer::Base.deliveries.clear
 
     # Test resetting using an address that matches a different user
     # that has the same address in a different case

-    assert_difference('ActionMailer::Base.deliveries.size', 1) do
-      post :lost_password, :user => { :email => users(:normal_user).email.upcase }
+    assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      post :lost_password, :params => { :user => { :email => user.email.upcase } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match /^Sorry you lost it/, flash[:notice]
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match /^Sorry you lost it/, flash[:notice]
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count

-    assert_equal users(:uppercase_user).email, email.to.first
+    assert_equal uppercase_user.email, email.to.first

     ActionMailer::Base.deliveries.clear
 
     # Test resetting using an address that is a case insensitive match
     # for more than one user but not an exact match for either
     ActionMailer::Base.deliveries.clear
 
     # Test resetting using an address that is a case insensitive match
     # for more than one user but not an exact match for either

-    assert_difference('ActionMailer::Base.deliveries.size', 0) do
-      post :lost_password, :user => { :email => users(:normal_user).email.titlecase }
+    assert_no_difference "ActionMailer::Base.deliveries.size" do
+      post :lost_password, :params => { :user => { :email => user.email.titlecase } }

     end
     assert_response :success
     assert_template :lost_password
     end
     assert_response :success
     assert_template :lost_password


@@ -405,93 +704,166 @@ class UserControllerTest < ActionController::TestCase
 
     # Test resetting using the address as recorded for a user that has an
     # address which is case insensitively unique
 
     # Test resetting using the address as recorded for a user that has an
     # address which is case insensitively unique

-    assert_difference('ActionMailer::Base.deliveries.size', 1) do
-      post :lost_password, :user => { :email => users(:public_user).email }
+    third_user = create(:user)
+    assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      post :lost_password, :params => { :user => { :email => third_user.email } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match /^Sorry you lost it/, flash[:notice]
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match /^Sorry you lost it/, flash[:notice]
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count

-    assert_equal users(:public_user).email, email.to.first
+    assert_equal third_user.email, email.to.first

     ActionMailer::Base.deliveries.clear
 
     # Test resetting using an address that matches a user that has the
     # same (case insensitively unique) address in a different case
     ActionMailer::Base.deliveries.clear
 
     # Test resetting using an address that matches a user that has the
     # same (case insensitively unique) address in a different case

-    assert_difference('ActionMailer::Base.deliveries.size', 1) do
-      post :lost_password, :user => { :email => users(:public_user).email.upcase }
+    assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      post :lost_password, :params => { :user => { :email => third_user.email.upcase } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match /^Sorry you lost it/, flash[:notice]
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match /^Sorry you lost it/, flash[:notice]
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count

-    assert_equal users(:public_user).email, email.to.first
+    assert_equal third_user.email, email.to.first

     ActionMailer::Base.deliveries.clear
   end
 
   def test_reset_password
     ActionMailer::Base.deliveries.clear
   end
 
   def test_reset_password

+    user = create(:user, :pending)

     # Test a request with no token
     get :reset_password
     assert_response :bad_request
 
     # Test a request with a bogus token
     # Test a request with no token
     get :reset_password
     assert_response :bad_request
 
     # Test a request with a bogus token

-    get :reset_password, :token => "made_up_token"
+    get :reset_password, :params => { :token => "made_up_token" }

     assert_response :redirect
     assert_redirected_to :action => :lost_password
 
     # Create a valid token for a user
     assert_response :redirect
     assert_redirected_to :action => :lost_password
 
     # Create a valid token for a user

-    token = User.find(users(:inactive_user).id).tokens.create
+    token = user.tokens.create

 
     # Test a request with a valid token
 
     # Test a request with a valid token

-    get :reset_password, :token => token.token
+    get :reset_password, :params => { :token => token.token }
+    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_response :success
     assert_template :reset_password

+    assert_select "div#errorExplanation"

 
     # Test setting a new password
 
     # Test setting a new password

-    post :reset_password, :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" }
+    post :reset_password, :params => { :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" } }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :login
-    user = User.find(users(:inactive_user).id)
+    assert_redirected_to root_path
+    assert_equal user.id, session[:user]
+    user.reload

     assert_equal "active", user.status
     assert_equal true, user.email_valid
     assert_equal "active", user.status
     assert_equal true, user.email_valid

-    assert_equal user, User.authenticate(:username => "inactive@openstreetmap.org", :password => "new_password")
+    assert_equal user, User.authenticate(:username => user.email, :password => "new_password")

   end
 
   end
 

-  def test_user_update
+  def test_account

     # Get a user to work with - note that this user deliberately
     # conflicts with uppercase_user in the email and display name
     # fields to test that we can change other fields without any
     # validation errors being reported
     # Get a user to work with - note that this user deliberately
     # conflicts with uppercase_user in the email and display name
     # fields to test that we can change other fields without any
     # validation errors being reported

-    user = users(:normal_user)
+    user = create(:user, :languages => [])
+    _uppercase_user = build(:user, :email => user.email.upcase, :display_name => user.display_name.upcase).tap { |u| u.save(:validate => false) }

 
     # Make sure that you are redirected to the login page when
     # you are not logged in
 
     # Make sure that you are redirected to the login page when
     # you are not logged in

-    get :account, { :display_name => user.display_name }
+    get :account, :params => { :display_name => user.display_name }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/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
 
     # Make sure that you are blocked when not logged in as the right user

-    get :account, { :display_name => user.display_name }, { "user" => users(:public_user).id }
+    get :account, :params => { :display_name => user.display_name }, :session => { :user => create(:user) }

     assert_response :forbidden
 
     # Make sure we get the page when we are logged in as the right user
     assert_response :forbidden
 
     # Make sure we get the page when we are logged in as the right user

-    get :account, { :display_name => user.display_name }, { "user" => user }
+    get :account, :params => { :display_name => user.display_name }, :session => { :user => user }

     assert_response :success
     assert_template :account
     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"
 
     # Updating the description should work
     user.description = "new description"

-    post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+    user.preferred_editor = "default"
+    post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }

     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_select ".notice", /^User information updated successfully/
     assert_select "form#accountForm > fieldset > div.form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
 
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_select ".notice", /^User information updated successfully/
     assert_select "form#accountForm > fieldset > div.form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
 

+    # Changing to a invalid editor should fail
+    user.preferred_editor = "unknown"
+    post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
+    assert_response :success
+    assert_template :account
+    assert_select ".notice", false
+    assert_select "div#errorExplanation"
+    assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected]", false
+
+    # Changing to a valid editor should work
+    user.preferred_editor = "potlatch2"
+    post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
+    assert_response :success
+    assert_template :account
+    assert_select "div#errorExplanation", false
+    assert_select ".notice", /^User information updated successfully/
+    assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected][value=?]", "potlatch2"
+
+    # Changing to the default editor should work
+    user.preferred_editor = "default"
+    post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
+    assert_response :success
+    assert_template :account
+    assert_select "div#errorExplanation", false
+    assert_select ".notice", /^User information updated successfully/
+    assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected]", false
+
+    # Changing to an uploaded image should work
+    image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif")
+    post :account, :params => { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, :session => { :user => user }
+    assert_response :success
+    assert_template :account
+    assert_select "div#errorExplanation", false
+    assert_select ".notice", /^User information updated successfully/
+    assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked][value=?]", "keep"
+
+    # Changing to a gravatar image should work
+    post :account, :params => { :display_name => user.display_name, :image_action => "gravatar", :user => user.attributes }, :session => { :user => user }
+    assert_response :success
+    assert_template :account
+    assert_select "div#errorExplanation", false
+    assert_select ".notice", /^User information updated successfully/
+    assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked][value=?]", "gravatar"
+
+    # Removing the image should work
+    post :account, :params => { :display_name => user.display_name, :image_action => "delete", :user => user.attributes }, :session => { :user => user }
+    assert_response :success
+    assert_template :account
+    assert_select "div#errorExplanation", false
+    assert_select ".notice", /^User information updated successfully/
+    assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked]", false
+
+    # 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/#{ERB::Util.u(user.display_name)}/account")
+

     # Changing name to one that exists should fail
     # Changing name to one that exists should fail

-    new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name)
-    post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
+    new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name)
+    post :account, :params => { :display_name => user.display_name, :user => new_attributes }, :session => { :user => user }

     assert_response :success
     assert_template :account
     assert_select ".notice", false
     assert_response :success
     assert_template :account
     assert_select ".notice", false


@@ -499,8 +871,8 @@ class UserControllerTest < ActionController::TestCase
     assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name"
 
     # Changing name to one that exists should fail, regardless of case
     assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name"
 
     # Changing name to one that exists should fail, regardless of case

-    new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name.upcase)
-    post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
+    new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)
+    post :account, :params => { :display_name => user.display_name, :user => new_attributes }, :session => { :user => user }

     assert_response :success
     assert_template :account
     assert_select ".notice", false
     assert_response :success
     assert_template :account
     assert_select ".notice", false


@@ -509,7 +881,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")

-    post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
+    post :account, :params => { :display_name => user.display_name, :user => new_attributes }, :session => { :user => user }

     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false


@@ -520,9 +892,9 @@ class UserControllerTest < ActionController::TestCase
     user.display_name = "new tester"
 
     # Changing email to one that exists should fail
     user.display_name = "new tester"
 
     # Changing email to one that exists should fail

-    user.new_email = users(:public_user).email
-    assert_no_difference('ActionMailer::Base.deliveries.size') do
-      post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+    user.new_email = create(:user).email
+    assert_no_difference "ActionMailer::Base.deliveries.size" do
+      post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }

     end
     assert_response :success
     assert_template :account
     end
     assert_response :success
     assert_template :account


@@ -531,9 +903,9 @@ class UserControllerTest < ActionController::TestCase
     assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email"
 
     # Changing email to one that exists should fail, regardless of case
     assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email"
 
     # Changing email to one that exists should fail, regardless of case

-    user.new_email = users(:public_user).email.upcase
-    assert_no_difference('ActionMailer::Base.deliveries.size') do
-      post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+    user.new_email = create(:user).email.upcase
+    assert_no_difference "ActionMailer::Base.deliveries.size" do
+      post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }

     end
     assert_response :success
     assert_template :account
     end
     assert_response :success
     assert_template :account


@@ -543,8 +915,8 @@ class UserControllerTest < ActionController::TestCase
 
     # Changing email to one that doesn't exist should work
     user.new_email = "new_tester@example.com"
 
     # Changing email to one that doesn't exist should work
     user.new_email = "new_tester@example.com"

-    assert_difference('ActionMailer::Base.deliveries.size', 1) do
-      post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+    assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }

     end
     assert_response :success
     assert_template :account
     end
     assert_response :success
     assert_template :account


@@ -556,114 +928,149 @@ class UserControllerTest < ActionController::TestCase
     assert_equal user.new_email, email.to.first
     ActionMailer::Base.deliveries.clear
   end
     assert_equal user.new_email, email.to.first
     ActionMailer::Base.deliveries.clear
   end

-  
+

   # Check that the user account page will display and contains some relevant
   # information for the user
   # Check that the user account page will display and contains some relevant
   # information for the user

-  def test_user_view_account
+  def test_view

     # Test a non-existent user
     # Test a non-existent user

-    get :view, {:display_name => "unknown"}
+    get :view, :params => { :display_name => "unknown" }

     assert_response :not_found
     assert_response :not_found

-    
+

     # Test a normal user
     # Test a normal user

-    get :view, {:display_name => "test"}
+    user = create(:user)
+    get :view, :params => { :display_name => user.display_name }

     assert_response :success
     assert_select "div#userinformation" do
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href^=/user/test/history]", 1
-      assert_select "a[href=/user/test/traces]", 1
-      assert_select "a[href=/user/test/diary]", 1
-      assert_select "a[href=/user/test/diary/comments]", 1
-      assert_select "a[href=/user/test/account]", 0
-      assert_select "a[href=/user/test/blocks]", 0
-      assert_select "a[href=/user/test/blocks_by]", 0
-      assert_select "a[href=/blocks/new/test]", 0
-    end
-    
+      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
+

     # Test a user who has been blocked
     # Test a user who has been blocked

-    get :view, {:display_name => "blocked"}
+    blocked_user = create(:user)
+    create(:user_block, :user => blocked_user)
+    get :view, :params => { :display_name => blocked_user.display_name }

     assert_response :success
     assert_select "div#userinformation" do
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href^=/user/blocked/history]", 1
-      assert_select "a[href=/user/blocked/traces]", 1
-      assert_select "a[href=/user/blocked/diary]", 1
-      assert_select "a[href=/user/blocked/diary/comments]", 1
-      assert_select "a[href=/user/blocked/account]", 0
-      assert_select "a[href=/user/blocked/blocks]", 1
-      assert_select "a[href=/user/blocked/blocks_by]", 0
-      assert_select "a[href=/blocks/new/blocked]", 0
-    end
-    
+      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
     # Test a moderator who has applied blocks

-    get :view, {:display_name => "moderator"}
+    moderator_user = create(:moderator_user)
+    create(:user_block, :creator => moderator_user)
+    get :view, :params => { :display_name => moderator_user.display_name }

     assert_response :success
     assert_select "div#userinformation" do
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href^=/user/moderator/history]", 1
-      assert_select "a[href=/user/moderator/traces]", 1
-      assert_select "a[href=/user/moderator/diary]", 1
-      assert_select "a[href=/user/moderator/diary/comments]", 1
-      assert_select "a[href=/user/moderator/account]", 0
-      assert_select "a[href=/user/moderator/blocks]", 0
-      assert_select "a[href=/user/moderator/blocks_by]", 1
-      assert_select "a[href=/blocks/new/moderator]", 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
     end
 
     # Login as a normal user

-    session[:user] = users(:normal_user).id
+    session[:user] = user.id

 
     # Test the normal user
 
     # Test the normal user

-    get :view, {:display_name => "test"}
+    get :view, :params => { :display_name => user.display_name }

     assert_response :success
     assert_select "div#userinformation" do
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href^=/user/test/history]", 1
-      assert_select "a[href=/traces/mine]", 1
-      assert_select "a[href=/user/test/diary]", 1
-      assert_select "a[href=/user/test/diary/comments]", 1
-      assert_select "a[href=/user/test/account]", 1
-      assert_select "a[href=/user/test/blocks]", 0
-      assert_select "a[href=/user/test/blocks_by]", 0
-      assert_select "a[href=/blocks/new/test]", 0
+      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/#{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
 
     # Login as a moderator
     end
 
     # Login as a moderator

-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id

 
     # Test the normal user
 
     # Test the normal user

-    get :view, {:display_name => "test"}
+    get :view, :params => { :display_name => user.display_name }
+    assert_response :success
+    assert_select "div#userinformation" do
+      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
+
+  # Test whether information about contributor terms is shown for users who haven't agreed
+  def test_terms_not_agreed
+    agreed_user = create(:user, :terms_agreed => 3.days.ago)
+    seen_user = create(:user, :terms_seen => true)
+    not_seen_user = create(:user, :terms_seen => false)
+
+    get :view, :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 }

     assert_response :success
     assert_response :success

+    # put @response.body

     assert_select "div#userinformation" do
     assert_select "div#userinformation" do

-      assert_select "a[href^=/user/test/history]", 1
-      assert_select "a[href=/user/test/traces]", 1
-      assert_select "a[href=/user/test/diary]", 1
-      assert_select "a[href=/user/test/diary/comments]", 1
-      assert_select "a[href=/user/test/account]", 0
-      assert_select "a[href=/user/test/blocks]", 0
-      assert_select "a[href=/user/test/blocks_by]", 0
-      assert_select "a[href=/blocks/new/test]", 1
+      assert_select "p", :count => 1, :text => /Contributor terms/
+      assert_select "p", /Declined/
+    end
+
+    get :view, :params => { :display_name => not_seen_user.display_name }
+    assert_response :success
+    assert_select "div#userinformation" do
+      assert_select "p", :count => 1, :text => /Contributor terms/
+      assert_select "p", /Undecided/

     end
   end
 
     end
   end
 

-  def test_user_api_read
+  def test_api_read
+    user = create(:user, :description => "test", :terms_agreed => Date.yesterday)

     # check that a visible user is returned properly
     # check that a visible user is returned properly

-    get :api_read, :id => users(:normal_user).id
+    get :api_read, :params => { :id => user.id }

     assert_response :success
     assert_response :success

+    assert_equal "text/xml", response.content_type

 
     # check the data that is returned
     assert_select "description", :count => 1, :text => "test"
     assert_select "contributor-terms", :count => 1 do
 
     # check the data that is returned
     assert_select "description", :count => 1, :text => "test"
     assert_select "contributor-terms", :count => 1 do

-      assert_select "[agreed=true]"
+      assert_select "[agreed='true']"

     end
     end

-    assert_select "img", :count => 1
+    assert_select "img", :count => 0

     assert_select "roles", :count => 1 do
       assert_select "role", :count => 0
     end
     assert_select "changesets", :count => 1 do
     assert_select "roles", :count => 1 do
       assert_select "role", :count => 0
     end
     assert_select "changesets", :count => 1 do

-      assert_select "[count=0]"
+      assert_select "[count='0']"

     end
     assert_select "traces", :count => 1 do
     end
     assert_select "traces", :count => 1 do

-      assert_select "[count=0]"
+      assert_select "[count='0']"

     end
     assert_select "blocks", :count => 1 do
       assert_select "received", :count => 1 do
     end
     assert_select "blocks", :count => 1 do
       assert_select "received", :count => 1 do

-        assert_select "[count=0][active=0]"
+        assert_select "[count='0'][active='0']"

       end
       assert_select "issued", :count => 0
     end
       end
       assert_select "issued", :count => 0
     end


@@ -675,105 +1082,127 @@ class UserControllerTest < ActionController::TestCase
     assert_select "messages", false
 
     # check that a suspended user is not returned
     assert_select "messages", false
 
     # check that a suspended user is not returned

-    get :api_read, :id => users(:suspended_user).id
+    get :api_read, :params => { :id => create(:user, :suspended).id }

     assert_response :gone
 
     # check that a deleted user is not returned
     assert_response :gone
 
     # check that a deleted user is not returned

-    get :api_read, :id => users(:deleted_user).id
+    get :api_read, :params => { :id => create(:user, :deleted).id }

     assert_response :gone
 
     # check that a non-existent user is not returned
     assert_response :gone
 
     # check that a non-existent user is not returned

-    get :api_read, :id => 0
+    get :api_read, :params => { :id => 0 }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 

-  def test_user_api_details
+  def test_api_details
+    user = create(:user, :description => "test", :terms_agreed => Date.yesterday, :home_lat => 12.1, :home_lon => 12.1, :languages => ["en"])
+    create(:message, :read, :recipient => user)
+    create(:message, :sender => user)
+

     # check that nothing is returned when not logged in
     get :api_details
     assert_response :unauthorized
     # check that nothing is returned when not logged in
     get :api_details
     assert_response :unauthorized

-    
+

     # check that we get a response when logged in
     # check that we get a response when logged in

-    basic_authorization(users(:normal_user).email, "test")
+    basic_authorization user.email, "test"

     get :api_details
     assert_response :success
     get :api_details
     assert_response :success

+    assert_equal "text/xml", response.content_type

 
     # check the data that is returned
     assert_select "description", :count => 1, :text => "test"
     assert_select "contributor-terms", :count => 1 do
 
     # check the data that is returned
     assert_select "description", :count => 1, :text => "test"
     assert_select "contributor-terms", :count => 1 do

-      assert_select "[agreed=true][pd=false]"
+      assert_select "[agreed='true'][pd='false']"

     end
     end

-    assert_select "img", :count => 1
+    assert_select "img", :count => 0

     assert_select "roles", :count => 1 do
       assert_select "role", :count => 0
     end
     assert_select "changesets", :count => 1 do
     assert_select "roles", :count => 1 do
       assert_select "role", :count => 0
     end
     assert_select "changesets", :count => 1 do

-      assert_select "[count=0]", :count => 1
+      assert_select "[count='0']", :count => 1

     end
     assert_select "traces", :count => 1 do
     end
     assert_select "traces", :count => 1 do

-      assert_select "[count=0]", :count => 1
+      assert_select "[count='0']", :count => 1

     end
     assert_select "blocks", :count => 1 do
       assert_select "received", :count => 1 do
     end
     assert_select "blocks", :count => 1 do
       assert_select "received", :count => 1 do

-        assert_select "[count=0][active=0]"
+        assert_select "[count='0'][active='0']"

       end
       assert_select "issued", :count => 0
     end
     assert_select "home", :count => 1 do
       end
       assert_select "issued", :count => 0
     end
     assert_select "home", :count => 1 do

-      assert_select "[lat=12.1][lon=12.1][zoom=3]"
+      assert_select "[lat='12.1'][lon='12.1'][zoom='3']"

     end
     assert_select "languages", :count => 1 do
       assert_select "lang", :count => 1, :text => "en"
     end
     assert_select "messages", :count => 1 do
       assert_select "received", :count => 1 do
     end
     assert_select "languages", :count => 1 do
       assert_select "lang", :count => 1, :text => "en"
     end
     assert_select "messages", :count => 1 do
       assert_select "received", :count => 1 do

-        assert_select "[count=1][unread=0]"
+        assert_select "[count='1'][unread='0']"

       end
       assert_select "sent", :count => 1 do
       end
       assert_select "sent", :count => 1 do

-        assert_select "[count=1]"
+        assert_select "[count='1']"

       end
     end
   end
 
       end
     end
   end
 

-  def test_user_make_friend
+  def test_api_gpx_files
+    user = create(:user)
+    trace1 = create(:trace, :user => user) do |trace|
+      create(:tracetag, :trace => trace, :tag => "London")
+    end
+    trace2 = create(:trace, :user => user) do |trace|
+      create(:tracetag, :trace => trace, :tag => "Birmingham")
+    end
+    # check that nothing is returned when not logged in
+    get :api_gpx_files
+    assert_response :unauthorized
+
+    # check that we get a response when logged in
+    basic_authorization user.email, "test"
+    get :api_gpx_files
+    assert_response :success
+    assert_equal "application/xml", response.content_type
+
+    # check the data that is returned
+    assert_select "gpx_file[id='#{trace1.id}']", 1 do
+      assert_select "tag", "London"
+    end
+    assert_select "gpx_file[id='#{trace2.id}']", 1 do
+      assert_select "tag", "Birmingham"
+    end
+  end
+
+  def test_make_friend

     # Get users to work with
     # Get users to work with

-    user = users(:normal_user)
-    friend = users(:second_public_user)
+    user = create(:user)
+    friend = create(:user)

 
     # Check that the users aren't already friends
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When not logged in a GET should ask us to login
 
     # Check that the users aren't already friends
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When not logged in a GET should ask us to login

-    get :make_friend, {:display_name => friend.display_name}
+    get :make_friend, :params => { :display_name => friend.display_name }

     assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name)
 
     # When not logged in a POST should error
     assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name)
 
     # When not logged in a POST should error

-    post :make_friend, {:display_name => friend.display_name}
+    post :make_friend, :params => { :display_name => friend.display_name }

     assert_response :forbidden
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When logged in a GET should get a confirmation page
     assert_response :forbidden
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When logged in a GET should get a confirmation page

-    get :make_friend, {:display_name => friend.display_name}, {"user" => user}
+    get :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }

     assert_response :success
     assert_template :make_friend
     assert_select "form" do
     assert_response :success
     assert_template :make_friend
     assert_select "form" do

-      assert_select "input[type=hidden][name=referer]", 0
-      assert_select "input[type=submit]", 1
-    end
-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
-
-    # The GET should preserve any referer
-    get :make_friend, {:display_name => friend.display_name, :referer => "/test"}, {"user" => user}
-    assert_response :success
-    assert_template :make_friend
-    assert_select "form" do
-      assert_select "input[type=hidden][name=referer][value=/test]", 1
-      assert_select "input[type=submit]", 1
+      assert_select "input[type='hidden'][name='referer']", 0
+      assert_select "input[type='submit']", 1

     end
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When logged in a POST should add the friendship
     end
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When logged in a POST should add the friendship

-    assert_difference('ActionMailer::Base.deliveries.size', 1) do
-      post :make_friend, {:display_name => friend.display_name}, {"user" => user}
+    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]
     end
     assert_redirected_to user_path(:display_name => friend.display_name)
     assert_match /is now your friend/, flash[:notice]


@@ -784,108 +1213,349 @@ class UserControllerTest < ActionController::TestCase
     ActionMailer::Base.deliveries.clear
 
     # A second POST should report that the friendship already exists
     ActionMailer::Base.deliveries.clear
 
     # A second POST should report that the friendship already exists

-    assert_no_difference('ActionMailer::Base.deliveries.size') do
-      post :make_friend, {:display_name => friend.display_name}, {"user" => user}
+    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 Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
   end
 
     end
     assert_redirected_to user_path(:display_name => friend.display_name)
     assert_match /You are already friends with/, flash[:warning]
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
   end
 

-  def test_user_remove_friend
+  def test_make_friend_with_referer

     # Get users to work with
     # Get users to work with

-    user = users(:normal_user)
-    friend = users(:public_user)
+    user = create(:user)
+    friend = create(:user)
+
+    # Check that the users aren't already friends
+    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+
+    # The GET should preserve any referer
+    get :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
+    assert_response :success
+    assert_template :make_friend
+    assert_select "form" do
+      assert_select "input[type='hidden'][name='referer'][value='/test']", 1
+      assert_select "input[type='submit']", 1
+    end
+    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+
+    # When logged in a POST should add the friendship and refer us
+    assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      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 Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    email = ActionMailer::Base.deliveries.first
+    assert_equal 1, email.to.count
+    assert_equal friend.email, email.to.first
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def test_make_friend_unkown_user
+    # Should error when a bogus user is specified
+    get :make_friend, :params => { :display_name => "No Such User" }, :session => { :user => create(:user) }
+    assert_response :not_found
+    assert_template :no_such_user
+  end
+
+  def test_remove_friend
+    # Get users to work with
+    user = create(:user)
+    friend = create(:user)
+    create(:friend, :befriender => user, :befriendee => friend)

 
     # Check that the users are friends
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When not logged in a GET should ask us to login
 
     # Check that the users are friends
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When not logged in a GET should ask us to login

-    get :remove_friend, {:display_name => friend.display_name}
+    get :remove_friend, :params => { :display_name => friend.display_name }

     assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name)
 
     # When not logged in a POST should error
     assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name)
 
     # When not logged in a POST should error

-    post :remove_friend, {:display_name => friend.display_name}
+    post :remove_friend, :params => { :display_name => friend.display_name }

     assert_response :forbidden
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When logged in a GET should get a confirmation page
     assert_response :forbidden
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When logged in a GET should get a confirmation page

-    get :remove_friend, {:display_name => friend.display_name}, {"user" => user}
+    get :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }

     assert_response :success
     assert_template :remove_friend
     assert_select "form" do
     assert_response :success
     assert_template :remove_friend
     assert_select "form" do

-      assert_select "input[type=hidden][name=referer]", 0
-      assert_select "input[type=submit]", 1
+      assert_select "input[type='hidden'][name='referer']", 0
+      assert_select "input[type='submit']", 1

     end
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     end
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 

+    # 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_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_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+  end
+
+  def test_remove_friend_with_referer
+    # Get users to work with
+    user = create(:user)
+    friend = create(:user)
+    create(:friend, :user_id => user.id, :friend_user_id => friend.id)
+
+    # Check that the users are friends
+    assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+

     # The GET should preserve any referer
     # The GET should preserve any referer

-    get :remove_friend, {:display_name => friend.display_name, :referer => "/test"}, {"user" => user}
+    get :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }

     assert_response :success
     assert_template :remove_friend
     assert_select "form" do
     assert_response :success
     assert_template :remove_friend
     assert_select "form" do

-      assert_select "input[type=hidden][name=referer][value=/test]", 1
-      assert_select "input[type=submit]", 1
+      assert_select "input[type='hidden'][name='referer'][value='/test']", 1
+      assert_select "input[type='submit']", 1

     end
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     end
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 

-    # When logged in a POST should remove the friendship
-    post :remove_friend, {:display_name => friend.display_name}, {"user" => user}
-    assert_redirected_to user_path(:display_name => friend.display_name)
+    # 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_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
     assert_match /was removed from your friends/, flash[:notice]
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first

+  end

 
 

-    # A second POST should report that the friendship does not exist
-    post :remove_friend, {:display_name => friend.display_name}, {"user" => user}
-    assert_redirected_to user_path(:display_name => friend.display_name)
-    assert_match /is not one of your friends/, flash[:error]
-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+  def test_remove_friend_unkown_user
+    # Should error when a bogus user is specified
+    get :remove_friend, :params => { :display_name => "No Such User" }, :session => { :user => create(:user) }
+    assert_response :not_found
+    assert_template :no_such_user

   end
 
   def test_set_status
   end
 
   def test_set_status

+    user = create(:user)
+

     # Try without logging in
     # Try without logging in

-    get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}
+    get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }

     assert_response :redirect
     assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended")
 
     # Now try as a normal user
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended")
 
     # Now try as a normal user

-    get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id}
+    get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+    assert_redirected_to :action => :view, :display_name => user.display_name

 
     # Finally try as an administrator
 
     # Finally try as an administrator

-    get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id}
+    get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
-    assert_equal "suspended", User.find(users(:normal_user).id).status
+    assert_redirected_to :action => :view, :display_name => user.display_name
+    assert_equal "suspended", User.find(user.id).status

   end
 
   def test_delete
   end
 
   def test_delete

+    user = create(:user, :home_lat => 12.1, :home_lon => 12.1, :description => "test")
+

     # Try without logging in
     # Try without logging in

-    get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}
+    get :delete, :params => { :display_name => user.display_name, :status => "suspended" }

     assert_response :redirect
     assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended")
 
     # Now try as a normal user
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended")
 
     # Now try as a normal user

-    get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id}
+    get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+    assert_redirected_to :action => :view, :display_name => user.display_name

 
     # Finally try as an administrator
 
     # Finally try as an administrator

-    get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id}
+    get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+    assert_redirected_to :action => :view, :display_name => user.display_name

 
     # Check that the user was deleted properly
 
     # Check that the user was deleted properly

-    user = User.find(users(:normal_user).id)
-    assert_equal "user_1", user.display_name
+    user.reload
+    assert_equal "user_#{user.id}", user.display_name

     assert_equal "", user.description
     assert_nil user.home_lat
     assert_nil user.home_lon
     assert_equal false, user.image.file?
     assert_equal false, user.email_valid
     assert_nil user.new_email
     assert_equal "", user.description
     assert_nil user.home_lat
     assert_nil user.home_lon
     assert_equal false, user.image.file?
     assert_equal false, user.email_valid
     assert_nil user.new_email

-    assert_nil user.openid_url
+    assert_nil user.auth_provider
+    assert_nil user.auth_uid

     assert_equal "deleted", user.status
   end
     assert_equal "deleted", user.status
   end

+
+  def test_list_get
+    user = create(:user)
+    moderator_user = create(:moderator_user)
+    administrator_user = create(:administrator_user)
+    _suspended_user = create(:user, :suspended)
+    _ip_user = create(:user, :creation_ip => "1.2.3.4")
+
+    # There are now 7 users - the five above, plus two extra "granters" for the
+    # moderator_user and administrator_user
+    assert_equal 7, User.count
+
+    # Shouldn't work when not logged in
+    get :list
+    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
+    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
+    assert_response :redirect
+    assert_redirected_to :action => :login, :referer => users_path
+
+    session[:user] = administrator_user.id
+
+    # Note there is a header row, so all row counts are users + 1
+    # Should work when logged in as an administrator
+    get :list
+    assert_response :success
+    assert_template :list
+    assert_select "table#user_list tr", :count => 7 + 1
+
+    # Should be able to limit by status
+    get :list, :params => { :status => "suspended" }
+    assert_response :success
+    assert_template :list
+    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" }
+    assert_response :success
+    assert_template :list
+    assert_select "table#user_list tr", :count => 1 + 1
+  end
+
+  def test_list_get_paginated
+    1.upto(100).each do |n|
+      User.create(:display_name => "extra_#{n}",
+                  :email => "extra#{n}@example.com",
+                  :pass_crypt => "extraextra")
+    end
+
+    session[:user] = create(:administrator_user).id
+
+    # 100 examples, an administrator, and a granter for the admin.
+    assert_equal 102, User.count
+
+    get :list
+    assert_response :success
+    assert_template :list
+    assert_select "table#user_list tr", :count => 51
+
+    get :list, :params => { :page => 2 }
+    assert_response :success
+    assert_template :list
+    assert_select "table#user_list tr", :count => 51
+
+    get :list, :params => { :page => 3 }
+    assert_response :success
+    assert_template :list
+    assert_select "table#user_list tr", :count => 3
+  end
+
+  def test_list_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 } }
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :login, :referer => users_path
+    assert_equal "pending", inactive_user.reload.status
+    assert_equal "suspended", suspended_user.reload.status
+
+    session[:user] = create(:user).id
+
+    # 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 } }
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :login, :referer => users_path
+    assert_equal "pending", inactive_user.reload.status
+    assert_equal "suspended", suspended_user.reload.status
+
+    session[:user] = create(:moderator_user).id
+
+    # 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 } }
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :login, :referer => users_path
+    assert_equal "pending", inactive_user.reload.status
+    assert_equal "suspended", suspended_user.reload.status
+
+    session[:user] = create(:administrator_user).id
+
+    # 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 } }
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :list
+    assert_equal "confirmed", inactive_user.reload.status
+    assert_equal "confirmed", suspended_user.reload.status
+  end
+
+  def test_list_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 } }
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :login, :referer => users_path
+    assert_equal "active", normal_user.reload.status
+    assert_equal "confirmed", confirmed_user.reload.status
+
+    session[:user] = create(:user).id
+
+    # 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 } }
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :login, :referer => users_path
+    assert_equal "active", normal_user.reload.status
+    assert_equal "confirmed", confirmed_user.reload.status
+
+    session[:user] = create(:moderator_user).id
+
+    # 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 } }
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :login, :referer => users_path
+    assert_equal "active", normal_user.reload.status
+    assert_equal "confirmed", confirmed_user.reload.status
+
+    session[:user] = create(:administrator_user).id
+
+    # 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 } }
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :list
+    assert_equal "deleted", normal_user.reload.status
+    assert_equal "deleted", confirmed_user.reload.status
+  end

 end
 end