X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bfe760a4b0372188f4964914bbc8e5bed31363ba..6648d3a2a6202566099423472665d3072eb02ae9:/test/controllers/user_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 6a5fca785..e149b83c7 100644
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -1,8 +1,9 @@
 require "test_helper"
 
 class UserControllerTest < ActionController::TestCase
-  api_fixtures
-  fixtures :messages
+  def setup
+    stub_hostip_requests
+  end
 
   ##
   # test all routes which lead to this controller
@@ -187,7 +188,7 @@ class UserControllerTest < ActionController::TestCase
     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
@@ -210,29 +211,29 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_new_view_logged_in
-    session[:user] = users(:normal_user).id
+    session[:user] = create(:user).id
 
     get :new
     assert_response :redirect
     assert_redirected_to user_new_path(:cookie_test => "true")
-    get :new, :cookie_test => "true"
+    get :new, :params => { :cookie_test => "true" }
     assert_response :redirect
     assert_redirected_to root_path
 
-    get :new, :referer => "/test"
+    get :new, :params => { :referer => "/test" }
     assert_response :redirect
     assert_redirected_to user_new_path(:referer => "/test", :cookie_test => "true")
-    get :new, :referer => "/test", :cookie_test => "true"
+    get :new, :params => { :referer => "/test", :cookie_test => "true" }
     assert_response :redirect
     assert_redirected_to "/test"
   end
 
   def test_new_success
-    user = new_user
+    user = build(:user, :pending)
 
     assert_difference "User.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 1 do
-        post :save, {}, { :new_user => user }
+        post :save, :session => { :new_user => user }
       end
     end
 
@@ -249,12 +250,12 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_new_duplicate_email
-    user = new_user
-    user.email = users(:public_user).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 }
+        post :save, :session => { :new_user => user }
       end
     end
 
@@ -264,12 +265,12 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_new_duplicate_email_uppercase
-    user = new_user
-    user.email = users(:public_user).email.upcase
+    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 }
+        post :save, :session => { :new_user => user }
       end
     end
 
@@ -279,12 +280,12 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_new_duplicate_name
-    user = new_user
-    user.display_name = users(:public_user).display_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, {}, { :new_user => user }
+        post :save, :session => { :new_user => user }
       end
     end
 
@@ -294,12 +295,12 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_new_duplicate_name_uppercase
-    user = new_user
-    user.display_name = users(:public_user).display_name.upcase
+    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, {}, { :new_user => user }
+        post :save, :session => { :new_user => user }
       end
     end
 
@@ -309,12 +310,12 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_save_referer_params
-    user = new_user
+    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" }
+        post :save, :session => { :new_user => user,
+                                  :referer => "/edit?editor=id#map=1/2/3" }
       end
     end
 
@@ -332,26 +333,26 @@ class UserControllerTest < ActionController::TestCase
 
     session_id = assert_select("input[name=session]").first["value"]
 
-    get :logout, :session => session_id
+    get :logout, :params => { :session => session_id }
     assert_response :redirect
     assert_redirected_to root_path
   end
 
   def test_logout_with_referer
-    get :logout, :referer => "/test"
+    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, :session => session_id, :referer => "/test"
+    get :logout, :params => { :session => session_id, :referer => "/test" }
     assert_response :redirect
     assert_redirected_to "/test"
   end
 
   def test_logout_with_token
-    token = users(:normal_user).tokens.create
+    token = create(:user).tokens.create
 
     session[:token] = token.token
 
@@ -364,7 +365,7 @@ class UserControllerTest < ActionController::TestCase
 
     session_id = assert_select("input[name=session]").first["value"]
 
-    get :logout, :session => session_id
+    get :logout, :params => { :session => session_id }
     assert_response :redirect
     assert_redirected_to root_path
     assert_nil session[:token]
@@ -372,112 +373,119 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_confirm_get
-    user = users(:inactive_user)
+    user = create(:user, :pending)
     confirm_string = user.tokens.create.token
 
     @request.cookies["_osm_session"] = user.display_name
-    get :confirm, :display_name => user.display_name, :confirm_string => confirm_string
+    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 = users(:normal_user)
+    user = create(:user)
     confirm_string = user.tokens.create.token
 
     @request.cookies["_osm_session"] = user.display_name
-    get :confirm, :display_name => user.display_name, :confirm_string => confirm_string
+    get :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
     assert_response :redirect
     assert_redirected_to root_path
   end
 
   def test_confirm_success_no_token_no_referer
-    user = users(:inactive_user)
+    user = create(:user, :pending)
+    stub_gravatar_request(user.email)
     confirm_string = user.tokens.create.token
 
     @request.cookies["_osm_session"] = user.display_name
-    post :confirm, :display_name => user.display_name, :confirm_string => confirm_string
+    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 = users(:inactive_user)
+    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, { :display_name => user.display_name, :confirm_string => confirm_string }, { :token => token }
+    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 = users(:inactive_user)
+    user = create(:user, :pending)
+    stub_gravatar_request(user.email)
     confirm_string = user.tokens.create.token
-    token = users(:normal_user).tokens.create.token
+    token = create(:user).tokens.create.token
 
     @request.cookies["_osm_session"] = user.display_name
-    post :confirm, { :display_name => user.display_name, :confirm_string => confirm_string }, { :token => token }
+    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 = users(:inactive_user)
+    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, :display_name => user.display_name, :confirm_string => confirm_string
+    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 = users(:inactive_user)
+    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, { :display_name => user.display_name, :confirm_string => confirm_string }, { :token => token }
+    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 = users(:inactive_user)
+    user = create(:user, :pending)
+    stub_gravatar_request(user.email)
     confirm_string = user.tokens.create(:referer => diary_new_path).token
-    token = users(:normal_user).tokens.create.token
+    token = create(:user).tokens.create.token
 
     @request.cookies["_osm_session"] = user.display_name
-    post :confirm, { :display_name => user.display_name, :confirm_string => confirm_string }, { :token => token }
+    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 = users(:inactive_user)
+    user = create(:user, :pending)
     confirm_string = user.tokens.create(:expiry => 1.day.ago).token
 
     @request.cookies["_osm_session"] = user.display_name
-    post :confirm, :display_name => user.display_name, :confirm_string => confirm_string
+    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 = users(:normal_user)
+    user = create(:user)
     confirm_string = user.tokens.create(:referer => diary_new_path).token
 
     @request.cookies["_osm_session"] = user.display_name
-    post :confirm, :display_name => user.display_name, :confirm_string => confirm_string
+    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
-    session[:token] = users(:inactive_user).tokens.create.token
+    user = create(:user, :pending)
+    session[:token] = user.tokens.create.token
 
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
-      get :confirm_resend, :display_name => users(:inactive_user).display_name
+      get :confirm_resend, :params => { :display_name => user.display_name }
     end
 
     assert_response :redirect
@@ -486,24 +494,25 @@ class UserControllerTest < ActionController::TestCase
 
     email = ActionMailer::Base.deliveries.last
 
-    assert_equal users(:inactive_user).email, email.to.first
+    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, :display_name => users(:inactive_user).display_name
+      get :confirm_resend, :params => { :display_name => user.display_name }
     end
 
     assert_response :redirect
     assert_redirected_to login_path
-    assert_match "User Inactive User not found.", flash[:error]
+    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, :display_name => "No Such User"
+      get :confirm_resend, :params => { :display_name => "No Such User" }
     end
 
     assert_response :redirect
@@ -512,36 +521,37 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_confirm_email_get
-    user = users(:normal_user)
+    user = create(:user)
     confirm_string = user.tokens.create.token
 
-    get :confirm_email, :confirm_string => confirm_string
+    get :confirm_email, :params => { :confirm_string => confirm_string }
     assert_response :success
     assert_template :confirm_email
   end
 
   def test_confirm_email_success
-    user = users(:second_public_user)
+    user = create(:user, :new_email => "test-new@example.com")
+    stub_gravatar_request(user.new_email)
     confirm_string = user.tokens.create.token
 
-    post :confirm_email, :confirm_string => confirm_string
+    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 = users(:normal_user)
+    user = create(:user)
     confirm_string = user.tokens.create.token
 
-    post :confirm_email, :confirm_string => confirm_string
+    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, :confirm_string => "XXXXX"
+    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]
@@ -552,45 +562,43 @@ class UserControllerTest < ActionController::TestCase
   # this happens when the email is actually changed
   # which is triggered by the confirmation mail
   def test_gravatar_auto_enable
-    with_http_stubs "gravatar" do
-      # switch to email that has a gravatar
-      user = users(:first_gravatar_user)
-      confirm_string = user.tokens.create.token
-      # precondition gravatar should be turned off
-      assert !user.image_use_gravatar
-      post :confirm_email, :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(users(:first_gravatar_user).id).image_use_gravatar
-    end
+    # 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
 
   def test_gravatar_auto_disable
-    with_http_stubs "gravatar" do
-      # switch to email without a gravatar
-      user = users(:second_gravatar_user)
-      confirm_string = user.tokens.create.token
-      # precondition gravatar should be turned on
-      assert user.image_use_gravatar
-      post :confirm_email, :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(users(:second_gravatar_user).id).image_use_gravatar
-    end
+    # 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, {}, { :new_user => User.new }
+    get :terms, :session => { :new_user => User.new }
     assert_response :success
     assert_template :terms
   end
 
-  def test_terms_seen
-    user = users(:normal_user)
+  def test_terms_agreed
+    user = create(:user, :terms_seen => true, :terms_agreed => Date.yesterday)
 
     session[:user] = user.id
 
@@ -600,7 +608,7 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_terms_not_seen_without_referer
-    user = users(:terms_not_seen_user)
+    user = create(:user, :terms_seen => false)
 
     session[:user] = user.id
 
@@ -608,7 +616,7 @@ class UserControllerTest < ActionController::TestCase
     assert_response :success
     assert_template :terms
 
-    post :save, :user => { :consider_pd => true }
+    post :save, :params => { :user => { :consider_pd => true } }
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => user.display_name
     assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
@@ -621,15 +629,15 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_terms_not_seen_with_referer
-    user = users(:terms_not_seen_user)
+    user = create(:user, :terms_seen => false)
 
     session[:user] = user.id
 
-    get :terms, :referer => "/test"
+    get :terms, :params => { :referer => "/test" }
     assert_response :success
     assert_template :terms
 
-    post :save, :user => { :consider_pd => true }, :referer => "/test"
+    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]
@@ -642,10 +650,11 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_go_public
-    post :go_public, {}, { :user => users(:normal_user) }
+    user = create(:user, :data_public => false)
+    post :go_public, :session => { :user => user }
     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 true, User.find(user.id).data_public
   end
 
   def test_lost_password
@@ -657,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
+    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, :user => { :email => users(:normal_user).email }
+      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
-    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
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
-      post :lost_password, :user => { :email => users(:normal_user).email.upcase }
+      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
-    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
     assert_no_difference "ActionMailer::Base.deliveries.size" do
-      post :lost_password, :user => { :email => users(:normal_user).email.titlecase }
+      post :lost_password, :params => { :user => { :email => user.email.titlecase } }
     end
     assert_response :success
     assert_template :lost_password
@@ -692,58 +704,66 @@ class UserControllerTest < ActionController::TestCase
 
     # Test resetting using the address as recorded for a user that has an
     # address which is case insensitively unique
+    third_user = create(:user)
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
-      post :lost_password, :user => { :email => users(:public_user).email }
+      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
-    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
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
-      post :lost_password, :user => { :email => users(:public_user).email.upcase }
+      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
-    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
+    user = create(:user, :pending)
     # 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
-    token = User.find(users(:inactive_user).id).tokens.create
+    token = user.tokens.create
 
     # 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_select "div#errorExplanation"
 
     # 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_redirected_to root_path
-    assert_equal users(:inactive_user).id, session[:user]
-    user = User.find(users(:inactive_user).id)
+    assert_equal user.id, session[:user]
+    user.reload
     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
 
   def test_account
@@ -751,26 +771,33 @@ class UserControllerTest < ActionController::TestCase
     # 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
-    get :account, :display_name => user.display_name
+    get :account, :params => { :display_name => user.display_name }
     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
-    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
-    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_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"
-    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
@@ -779,7 +806,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Changing to a invalid editor should fail
     user.preferred_editor = "unknown"
-    post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id }
+    post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
     assert_response :success
     assert_template :account
     assert_select ".notice", false
@@ -788,7 +815,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Changing to a valid editor should work
     user.preferred_editor = "potlatch2"
-    post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id }
+    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
@@ -797,7 +824,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Changing to the default editor should work
     user.preferred_editor = "default"
-    post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id }
+    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
@@ -805,8 +832,8 @@ class UserControllerTest < ActionController::TestCase
     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/traces/1.gif", "image/gif")
-    post :account, { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, { :user => user.id }
+    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
@@ -814,7 +841,7 @@ class UserControllerTest < ActionController::TestCase
     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, { :display_name => user.display_name, :image_action => "gravatar", :user => user.attributes }, { :user => user.id }
+    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
@@ -822,7 +849,7 @@ class UserControllerTest < ActionController::TestCase
     assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked][value=?]", "gravatar"
 
     # Removing the image should work
-    post :account, { :display_name => user.display_name, :image_action => "delete", :user => user.attributes }, { :user => user.id }
+    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
@@ -830,13 +857,13 @@ class UserControllerTest < ActionController::TestCase
     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, { :display_name => user.display_name, :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }, { :user => user.id }
+    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/#{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 => 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
@@ -844,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
-    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
@@ -854,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")
-    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
@@ -865,9 +892,9 @@ class UserControllerTest < ActionController::TestCase
     user.display_name = "new tester"
 
     # Changing email to one that exists should fail
-    user.new_email = users(:public_user).email
+    user.new_email = create(:user).email
     assert_no_difference "ActionMailer::Base.deliveries.size" do
-      post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id }
+      post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
     end
     assert_response :success
     assert_template :account
@@ -876,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
-    user.new_email = users(:public_user).email.upcase
+    user.new_email = create(:user).email.upcase
     assert_no_difference "ActionMailer::Base.deliveries.size" do
-      post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id }
+      post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
     end
     assert_response :success
     assert_template :account
@@ -889,7 +916,7 @@ class UserControllerTest < ActionController::TestCase
     # 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 }
+      post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
     end
     assert_response :success
     assert_template :account
@@ -906,89 +933,123 @@ class UserControllerTest < ActionController::TestCase
   # information for the user
   def test_view
     # Test a non-existent user
-    get :view, :display_name => "unknown"
+    get :view, :params => { :display_name => "unknown" }
     assert_response :not_found
 
     # 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_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
+      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
-    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_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
+      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
-    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_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
-    session[:user] = users(:normal_user).id
+    session[:user] = user.id
 
     # 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/test/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/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)}/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
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
     # 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/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 "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
+    # put @response.body
+    assert_select "div#userinformation" do
+      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
 
   def test_api_read
+    user = create(:user, :description => "test", :terms_agreed => Date.yesterday)
     # 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_equal "text/xml", response.content_type
 
@@ -1021,25 +1082,29 @@ class UserControllerTest < ActionController::TestCase
     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
-    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
-    get :api_read, :id => 0
+    get :api_read, :params => { :id => 0 }
     assert_response :not_found
   end
 
   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 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
     assert_equal "text/xml", response.content_type
@@ -1082,44 +1147,51 @@ class UserControllerTest < ActionController::TestCase
   end
 
   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(users(:normal_user).email, "test")
+    basic_authorization user.email, "test"
     get :api_gpx_files
     assert_response :success
-    assert_equal "text/xml", response.content_type
+    assert_equal "application/xml", response.content_type
 
     # check the data that is returned
-    assert_select "gpx_file[id='1']", 1 do
+    assert_select "gpx_file[id='#{trace1.id}']", 1 do
       assert_select "tag", "London"
     end
-    assert_select "gpx_file[id='4']", 1 do
+    assert_select "gpx_file[id='#{trace2.id}']", 1 do
       assert_select "tag", "Birmingham"
     end
   end
 
   def test_make_friend
     # 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
-    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
-    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
-    get :make_friend, { :display_name => friend.display_name }, { :user => user.id }
+    get :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
     assert_response :success
     assert_template :make_friend
     assert_select "form" do
@@ -1130,7 +1202,7 @@ class UserControllerTest < ActionController::TestCase
 
     # 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.id }
+      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]
@@ -1142,7 +1214,7 @@ class UserControllerTest < ActionController::TestCase
 
     # 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.id }
+      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]
@@ -1151,14 +1223,14 @@ class UserControllerTest < ActionController::TestCase
 
   def test_make_friend_with_referer
     # 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
 
     # The GET should preserve any referer
-    get :make_friend, { :display_name => friend.display_name, :referer => "/test" }, { :user => user.id }
+    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
@@ -1169,7 +1241,7 @@ class UserControllerTest < ActionController::TestCase
 
     # When logged in a POST should add the friendship and refer us
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
-      post :make_friend, { :display_name => friend.display_name, :referer => "/test" }, { :user => user.id }
+      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]
@@ -1182,31 +1254,31 @@ class UserControllerTest < ActionController::TestCase
 
   def test_make_friend_unkown_user
     # Should error when a bogus user is specified
-    get :make_friend, { :display_name => "No Such User" }, { :user => users(:normal_user).id }
+    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 = users(:normal_user)
-    friend = users(:public_user)
-    create(:friend, :user_id => user.id, :friend_user_id => friend.id)
+    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
-    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
-    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
-    get :remove_friend, { :display_name => friend.display_name }, { :user => user.id }
+    get :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
     assert_response :success
     assert_template :remove_friend
     assert_select "form" do
@@ -1216,13 +1288,13 @@ class UserControllerTest < ActionController::TestCase
     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.id }
+    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, { :display_name => friend.display_name }, { :user => user.id }
+    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
@@ -1230,15 +1302,15 @@ class UserControllerTest < ActionController::TestCase
 
   def test_remove_friend_with_referer
     # Get users to work with
-    user = users(:normal_user)
-    friend = users(:public_user)
+    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
-    get :remove_friend, { :display_name => friend.display_name, :referer => "/test" }, { :user => user.id }
+    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
@@ -1248,7 +1320,7 @@ class UserControllerTest < ActionController::TestCase
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When logged in a POST should remove the friendship and refer
-    post :remove_friend, { :display_name => friend.display_name, :referer => "/test" }, { :user => user.id }
+    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
@@ -1256,48 +1328,52 @@ class UserControllerTest < ActionController::TestCase
 
   def test_remove_friend_unkown_user
     # Should error when a bogus user is specified
-    get :remove_friend, { :display_name => "No Such User" }, { :user => users(:normal_user).id }
+    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
+    user = create(:user)
+
     # 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
-    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_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
-    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_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
+    user = create(:user, :home_lat => 12.1, :home_lon => 12.1, :description => "test")
+
     # 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
-    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_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
-    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_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
-    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
@@ -1310,44 +1386,55 @@ class UserControllerTest < ActionController::TestCase
   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] = users(:normal_user).id
+    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] = users(:moderator_user).id
+    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] = users(:administrator_user).id
+    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 => User.count + 1
+    assert_select "table#user_list tr", :count => 7 + 1
 
     # Should be able to limit by status
-    get :list, :status => "suspended"
+    get :list, :params => { :status => "suspended" }
     assert_response :success
     assert_template :list
-    assert_select "table#user_list tr", :count => User.where(:status => "suspended").count + 1
+    assert_select "table#user_list tr", :count => 1 + 1
 
     # Should be able to limit by IP address
-    get :list, :ip => "1.2.3.4"
+    get :list, :params => { :ip => "1.2.3.4" }
     assert_response :success
     assert_template :list
-    assert_select "table#user_list tr", :count => User.where(:creation_ip => "1.2.3.4").count + 1
+    assert_select "table#user_list tr", :count => 1 + 1
   end
 
   def test_list_get_paginated
@@ -1357,64 +1444,67 @@ class UserControllerTest < ActionController::TestCase
                   :pass_crypt => "extraextra")
     end
 
-    session[:user] = users(:administrator_user).id
+    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, :page => 2
+    get :list, :params => { :page => 2 }
     assert_response :success
     assert_template :list
     assert_select "table#user_list tr", :count => 51
 
-    get :list, :page => 3
+    get :list, :params => { :page => 3 }
     assert_response :success
     assert_template :list
-    assert_select "table#user_list tr", :count => 25
+    assert_select "table#user_list tr", :count => 3
   end
 
   def test_list_post_confirm
-    inactive_user = users(:inactive_user)
-    suspended_user = users(:suspended_user)
+    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, :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 }
+      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(:confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 })
+    assert_redirected_to :action => :login, :referer => users_path
     assert_equal "pending", inactive_user.reload.status
     assert_equal "suspended", suspended_user.reload.status
 
-    session[:user] = users(:normal_user).id
+    session[:user] = create(:user).id
 
     # Shouldn't work when logged in as a normal user
     assert_no_difference "User.active.count" do
-      post :list, :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 }
+      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(:confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 })
+    assert_redirected_to :action => :login, :referer => users_path
     assert_equal "pending", inactive_user.reload.status
     assert_equal "suspended", suspended_user.reload.status
 
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
     # Shouldn't work when logged in as a moderator
     assert_no_difference "User.active.count" do
-      post :list, :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 }
+      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(:confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 })
+    assert_redirected_to :action => :login, :referer => users_path
     assert_equal "pending", inactive_user.reload.status
     assert_equal "suspended", suspended_user.reload.status
 
-    session[:user] = users(:administrator_user).id
+    session[:user] = create(:administrator_user).id
 
     # Should work when logged in as an administrator
     assert_difference "User.active.count", 2 do
-      post :list, :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 }
+      post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end
     assert_response :redirect
     assert_redirected_to :action => :list
@@ -1423,62 +1513,49 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_list_post_hide
-    normal_user = users(:normal_user)
-    confirmed_user = users(:confirmed_user)
+    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, :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 }
+      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(:hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 })
+    assert_redirected_to :action => :login, :referer => users_path
     assert_equal "active", normal_user.reload.status
     assert_equal "confirmed", confirmed_user.reload.status
 
-    session[:user] = users(:normal_user).id
+    session[:user] = create(:user).id
 
     # Shouldn't work when logged in as a normal user
     assert_no_difference "User.active.count" do
-      post :list, :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 }
+      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(:hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 })
+    assert_redirected_to :action => :login, :referer => users_path
     assert_equal "active", normal_user.reload.status
     assert_equal "confirmed", confirmed_user.reload.status
 
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
     # Shouldn't work when logged in as a moderator
     assert_no_difference "User.active.count" do
-      post :list, :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 }
+      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(:hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 })
+    assert_redirected_to :action => :login, :referer => users_path
     assert_equal "active", normal_user.reload.status
     assert_equal "confirmed", confirmed_user.reload.status
 
-    session[:user] = users(:administrator_user).id
+    session[:user] = create(:administrator_user).id
 
     # Should work when logged in as an administrator
     assert_difference "User.active.count", -2 do
-      post :list, :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 }
+      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
-
-  private
-
-  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
-  end
 end