Remove inline javascript from id views

[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 03238ea28261324eb406ec5b48264d04abde9ea4..87fb99a6f832b21b0e508b549a25fe72a534bd89 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -2,7 +2,10 @@ require "test_helper"
 
 class UserControllerTest < ActionController::TestCase
   api_fixtures
 
 class UserControllerTest < ActionController::TestCase
   api_fixtures

-  fixtures :messages, :friends
+
+  def setup
+    stub_hostip_requests
+  end

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


@@ -393,6 +396,7 @@ class UserControllerTest < ActionController::TestCase
 
   def test_confirm_success_no_token_no_referer
     user = users(:inactive_user)
 
   def test_confirm_success_no_token_no_referer
     user = users(:inactive_user)

+    stub_gravatar_request(user.email)

     confirm_string = user.tokens.create.token
 
     @request.cookies["_osm_session"] = user.display_name
     confirm_string = user.tokens.create.token
 
     @request.cookies["_osm_session"] = user.display_name


@@ -403,6 +407,7 @@ class UserControllerTest < ActionController::TestCase
 
   def test_confirm_success_good_token_no_referer
     user = users(:inactive_user)
 
   def test_confirm_success_good_token_no_referer
     user = users(:inactive_user)

+    stub_gravatar_request(user.email)

     confirm_string = user.tokens.create.token
     token = user.tokens.create.token
 
     confirm_string = user.tokens.create.token
     token = user.tokens.create.token
 


@@ -413,6 +418,7 @@ class UserControllerTest < ActionController::TestCase
 
   def test_confirm_success_bad_token_no_referer
     user = users(:inactive_user)
 
   def test_confirm_success_bad_token_no_referer
     user = users(:inactive_user)

+    stub_gravatar_request(user.email)

     confirm_string = user.tokens.create.token
     token = users(:normal_user).tokens.create.token
 
     confirm_string = user.tokens.create.token
     token = users(:normal_user).tokens.create.token
 


@@ -424,6 +430,7 @@ class UserControllerTest < ActionController::TestCase
 
   def test_confirm_success_no_token_with_referer
     user = users(:inactive_user)
 
   def test_confirm_success_no_token_with_referer
     user = users(:inactive_user)

+    stub_gravatar_request(user.email)

     confirm_string = user.tokens.create(:referer => diary_new_path).token
 
     @request.cookies["_osm_session"] = user.display_name
     confirm_string = user.tokens.create(:referer => diary_new_path).token
 
     @request.cookies["_osm_session"] = user.display_name


@@ -434,6 +441,7 @@ class UserControllerTest < ActionController::TestCase
 
   def test_confirm_success_good_token_with_referer
     user = users(:inactive_user)
 
   def test_confirm_success_good_token_with_referer
     user = users(:inactive_user)

+    stub_gravatar_request(user.email)

     confirm_string = user.tokens.create(:referer => diary_new_path).token
     token = user.tokens.create.token
 
     confirm_string = user.tokens.create(:referer => diary_new_path).token
     token = user.tokens.create.token
 


@@ -444,6 +452,7 @@ class UserControllerTest < ActionController::TestCase
 
   def test_confirm_success_bad_token_with_referer
     user = users(:inactive_user)
 
   def test_confirm_success_bad_token_with_referer
     user = users(:inactive_user)

+    stub_gravatar_request(user.email)

     confirm_string = user.tokens.create(:referer => diary_new_path).token
     token = users(:normal_user).tokens.create.token
 
     confirm_string = user.tokens.create(:referer => diary_new_path).token
     token = users(:normal_user).tokens.create.token
 


@@ -474,6 +483,8 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_confirm_resend_success
   end
 
   def test_confirm_resend_success

+    session[:token] = users(:inactive_user).tokens.create.token
+

     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       get :confirm_resend, :display_name => users(:inactive_user).display_name
     end
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       get :confirm_resend, :display_name => users(:inactive_user).display_name
     end


@@ -489,7 +500,17 @@ class UserControllerTest < ActionController::TestCase
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end
 

-  def test_confirm_resend_failure
+  def test_confirm_resend_no_token
+    assert_no_difference "ActionMailer::Base.deliveries.size" do
+      get :confirm_resend, :display_name => users(:inactive_user).display_name
+    end
+
+    assert_response :redirect
+    assert_redirected_to login_path
+    assert_match "User Inactive User 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"
     end
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       get :confirm_resend, :display_name => "No Such User"
     end


@@ -510,6 +531,7 @@ class UserControllerTest < ActionController::TestCase
 
   def test_confirm_email_success
     user = users(:second_public_user)
 
   def test_confirm_email_success
     user = users(:second_public_user)

+    stub_gravatar_request(user.new_email)

     confirm_string = user.tokens.create.token
 
     post :confirm_email, :confirm_string => confirm_string
     confirm_string = user.tokens.create.token
 
     post :confirm_email, :confirm_string => confirm_string


@@ -535,6 +557,40 @@ class UserControllerTest < ActionController::TestCase
     assert_match /confirmation code has expired or does not exist/, flash[:error]
   end
 
     assert_match /confirmation code has expired or does not exist/, flash[:error]
   end
 

+  ##
+  # 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 = users(:first_gravatar_user)
+    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, :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
+
+  def test_gravatar_auto_disable
+    # switch to email without a gravatar
+    user = users(:second_gravatar_user)
+    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, :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
+

   def test_terms_new_user
     get :terms, {}, { :new_user => User.new }
     assert_response :success
   def test_terms_new_user
     get :terms, {}, { :new_user => User.new }
     assert_response :success


@@ -690,7 +746,8 @@ class UserControllerTest < ActionController::TestCase
     # Test setting a new password
     post :reset_password, :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" }
     assert_response :redirect
     # Test setting a new password
     post :reset_password, :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" }
     assert_response :redirect

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

     user = User.find(users(:inactive_user).id)
     assert_equal "active", user.status
     assert_equal true, user.email_valid
     user = User.find(users(:inactive_user).id)
     assert_equal "active", user.status
     assert_equal true, user.email_valid


@@ -711,7 +768,7 @@ class UserControllerTest < ActionController::TestCase
     assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account"
 
     # Make sure that you are blocked when not logged in as the right user
     assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/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, { :display_name => user.display_name }, { :user => users(:public_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


@@ -721,7 +778,7 @@ class UserControllerTest < ActionController::TestCase
 
     # 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 }
+    post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user }

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


@@ -730,7 +787,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Changing to a invalid editor should fail
     user.preferred_editor = "unknown"
 
     # 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, { :display_name => user.display_name, :user => user.attributes }, { :user => user }

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


@@ -739,7 +796,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Changing to a valid editor should work
     user.preferred_editor = "potlatch2"
 
     # 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, { :display_name => user.display_name, :user => user.attributes }, { :user => user }

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


@@ -748,7 +805,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Changing to the default editor should work
     user.preferred_editor = "default"
 
     # 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, { :display_name => user.display_name, :user => user.attributes }, { :user => user }

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


@@ -756,8 +813,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
     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, { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, { :user => user }

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


@@ -765,7 +822,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
     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, { :display_name => user.display_name, :image_action => "gravatar", :user => user.attributes }, { :user => user }

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


@@ -773,7 +830,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
     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, { :display_name => user.display_name, :image_action => "delete", :user => user.attributes }, { :user => user }

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


@@ -781,13 +838,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
     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, { :display_name => user.display_name, :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }, { :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")
 
     # Changing name to one that exists should fail
     new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name)
     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")
 
     # 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 }
+    post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user }

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


@@ -796,7 +853,7 @@ class UserControllerTest < ActionController::TestCase
 
     # 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)
 
     # 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 }
+    post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user }

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


@@ -805,7 +862,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, { :display_name => user.display_name, :user => new_attributes }, { :user => user }

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


@@ -818,7 +875,7 @@ class UserControllerTest < ActionController::TestCase
     # Changing email to one that exists should fail
     user.new_email = users(:public_user).email
     assert_no_difference "ActionMailer::Base.deliveries.size" do
     # 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 }
+      post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user }

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


@@ -829,7 +886,7 @@ class UserControllerTest < ActionController::TestCase
     # 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
     # 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 }
+      post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user }

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


@@ -840,7 +897,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
     # 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, { :display_name => user.display_name, :user => user.attributes }, { :user => user }

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


@@ -875,6 +932,7 @@ class UserControllerTest < ActionController::TestCase
     end
 
     # Test a user who has been blocked
     end
 
     # Test a user who has been blocked

+    create(:user_block, :user => users(:blocked_user))

     get :view, :display_name => "blocked"
     assert_response :success
     assert_select "div#userinformation" do
     get :view, :display_name => "blocked"
     assert_response :success
     assert_select "div#userinformation" do


@@ -889,6 +947,7 @@ class UserControllerTest < ActionController::TestCase
     end
 
     # Test a moderator who has applied blocks
     end
 
     # Test a moderator who has applied blocks

+    create(:user_block, :creator => users(:moderator_user))

     get :view, :display_name => "moderator"
     assert_response :success
     assert_select "div#userinformation" do
     get :view, :display_name => "moderator"
     assert_response :success
     assert_select "div#userinformation" do


@@ -948,7 +1007,7 @@ class UserControllerTest < ActionController::TestCase
     assert_select "contributor-terms", :count => 1 do
       assert_select "[agreed='true']"
     end
     assert_select "contributor-terms", :count => 1 do
       assert_select "[agreed='true']"
     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 "roles", :count => 1 do
       assert_select "role", :count => 0
     end


@@ -985,6 +1044,9 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_api_details
   end
 
   def test_api_details

+    create(:message, :read, :recipient => users(:normal_user))
+    create(:message, :sender => users(:normal_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


@@ -1000,7 +1062,7 @@ class UserControllerTest < ActionController::TestCase
     assert_select "contributor-terms", :count => 1 do
       assert_select "[agreed='true'][pd='false']"
     end
     assert_select "contributor-terms", :count => 1 do
       assert_select "[agreed='true'][pd='false']"
     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 "roles", :count => 1 do
       assert_select "role", :count => 0
     end


@@ -1033,6 +1095,12 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_api_gpx_files
   end
 
   def test_api_gpx_files

+    trace1 = create(:trace, :user => users(:normal_user)) do |trace|
+      create(:tracetag, :trace => trace, :tag => "London")
+    end
+    trace2 = create(:trace, :user => users(:normal_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 nothing is returned when not logged in
     get :api_gpx_files
     assert_response :unauthorized


@@ -1044,10 +1112,10 @@ class UserControllerTest < ActionController::TestCase
     assert_equal "text/xml", response.content_type
 
     # check the data that is returned
     assert_equal "text/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 "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
       assert_select "tag", "Birmingham"
     end
   end


@@ -1070,7 +1138,7 @@ class UserControllerTest < ActionController::TestCase
     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_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, { :display_name => friend.display_name }, { :user => user }

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


@@ -1081,7 +1149,7 @@ class UserControllerTest < ActionController::TestCase
 
     # When logged in a POST should add the friendship
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
 
     # 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, { :display_name => friend.display_name }, { :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]


@@ -1093,7 +1161,7 @@ class UserControllerTest < ActionController::TestCase
 
     # A second POST should report that the friendship already exists
     assert_no_difference "ActionMailer::Base.deliveries.size" do
 
     # 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, { :display_name => friend.display_name }, { :user => user }

     end
     assert_redirected_to user_path(:display_name => friend.display_name)
     assert_match /You are already friends with/, flash[:warning]
     end
     assert_redirected_to user_path(:display_name => friend.display_name)
     assert_match /You are already friends with/, flash[:warning]


@@ -1109,7 +1177,7 @@ class UserControllerTest < ActionController::TestCase
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # The GET should preserve any referer
     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, { :display_name => friend.display_name, :referer => "/test" }, { :user => user }

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


@@ -1120,7 +1188,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
 
     # 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, { :display_name => friend.display_name, :referer => "/test" }, { :user => user }

     end
     assert_redirected_to "/test"
     assert_match /is now your friend/, flash[:notice]
     end
     assert_redirected_to "/test"
     assert_match /is now your friend/, flash[:notice]


@@ -1133,7 +1201,7 @@ class UserControllerTest < ActionController::TestCase
 
   def test_make_friend_unkown_user
     # Should error when a bogus user is specified
 
   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, { :display_name => "No Such User" }, { :user => users(:normal_user) }

     assert_response :not_found
     assert_template :no_such_user
   end
     assert_response :not_found
     assert_template :no_such_user
   end


@@ -1142,6 +1210,7 @@ class UserControllerTest < ActionController::TestCase
     # Get users to work with
     user = users(:normal_user)
     friend = users(:public_user)
     # Get users to work with
     user = users(:normal_user)
     friend = users(:public_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
 
     # Check that the users are friends
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first


@@ -1156,7 +1225,7 @@ class UserControllerTest < ActionController::TestCase
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # When logged in a GET should get a confirmation page
     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, { :display_name => friend.display_name }, { :user => user }

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


@@ -1166,13 +1235,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
     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, { :display_name => friend.display_name }, { :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
     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, { :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
     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


@@ -1182,12 +1251,13 @@ class UserControllerTest < ActionController::TestCase
     # Get users to work with
     user = users(:normal_user)
     friend = users(:public_user)
     # Get users to work with
     user = users(:normal_user)
     friend = users(:public_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
 
     # 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, { :display_name => friend.display_name, :referer => "/test" }, { :user => user }

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


@@ -1197,7 +1267,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
     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, { :display_name => friend.display_name, :referer => "/test" }, { :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_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


@@ -1205,7 +1275,7 @@ class UserControllerTest < ActionController::TestCase
 
   def test_remove_friend_unkown_user
     # Should error when a bogus user is specified
 
   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, { :display_name => "No Such User" }, { :user => users(:normal_user) }

     assert_response :not_found
     assert_template :no_such_user
   end
     assert_response :not_found
     assert_template :no_such_user
   end


@@ -1217,12 +1287,12 @@ class UserControllerTest < ActionController::TestCase
     assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended")
 
     # Now try as a normal user
     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, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:normal_user) }

     assert_response :redirect
     assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
 
     # Finally try as an administrator
     assert_response :redirect
     assert_redirected_to :action => :view, :display_name => users(:normal_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, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(: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_response :redirect
     assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
     assert_equal "suspended", User.find(users(:normal_user).id).status


@@ -1235,12 +1305,12 @@ class UserControllerTest < ActionController::TestCase
     assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended")
 
     # Now try as a normal user
     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, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:normal_user) }

     assert_response :redirect
     assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
 
     # Finally try as an administrator
     assert_response :redirect
     assert_redirected_to :action => :view, :display_name => users(:normal_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, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:administrator_user) }

     assert_response :redirect
     assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
 
     assert_response :redirect
     assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
 


@@ -1321,7 +1391,7 @@ class UserControllerTest < ActionController::TestCase
     get :list, :page => 3
     assert_response :success
     assert_template :list
     get :list, :page => 3
     assert_response :success
     assert_template :list

-    assert_select "table#user_list tr", :count => 22
+    assert_select "table#user_list tr", :count => 26

   end
 
   def test_list_post_confirm
   end
 
   def test_list_post_confirm