class UsersControllerTest < ActionController::TestCase
def setup
+ super
+
stub_hostip_requests
end
end
def test_logout_without_referer
+ post :logout
+ assert_response :redirect
+ assert_redirected_to root_path
+ end
+
+ def test_logout_with_referer
+ post :logout, :params => { :referer => "/test" }
+ assert_response :redirect
+ assert_redirected_to "/test"
+ end
+
+ def test_logout_fallback_without_referer
get :logout
assert_response :success
assert_template :logout
assert_select "input[name=referer][value=?]", ""
-
- session_id = assert_select("input[name=session]").first["value"]
-
- get :logout, :params => { :session => session_id }
- assert_response :redirect
- assert_redirected_to root_path
end
- def test_logout_with_referer
+ def test_logout_fallback_with_referer
get :logout, :params => { :referer => "/test" }
assert_response :success
assert_template :logout
assert_select "input[name=referer][value=?]", "/test"
-
- session_id = assert_select("input[name=session]").first["value"]
-
- get :logout, :params => { :session => session_id, :referer => "/test" }
- assert_response :redirect
- assert_redirected_to "/test"
end
def test_logout_with_token
session[:token] = token.token
- get :logout
- assert_response :success
- assert_template :logout
- assert_select "input[name=referer][value=?]", ""
- assert_equal token.token, session[:token]
- assert_not_nil UserToken.where(:id => token.id).first
-
- session_id = assert_select("input[name=session]").first["value"]
-
- get :logout, :params => { :session => session_id }
+ post :logout
assert_response :redirect
assert_redirected_to root_path
assert_nil session[:token]
# Changing to an uploaded image should work
image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif")
- post :account, :params => { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, :session => { :user => user }
+ post :account, :params => { :display_name => user.display_name, :avatar_action => "new", :user => user.attributes.merge(:avatar => image) }, :session => { :user => user }
assert_response :success
assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked][value=?]", "keep"
+ assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=avatar_action][checked][value=?]", "keep"
# Changing to a gravatar image should work
- post :account, :params => { :display_name => user.display_name, :image_action => "gravatar", :user => user.attributes }, :session => { :user => user }
+ post :account, :params => { :display_name => user.display_name, :avatar_action => "gravatar", :user => user.attributes }, :session => { :user => user }
assert_response :success
assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked][value=?]", "gravatar"
+ assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=avatar_action][checked][value=?]", "gravatar"
# Removing the image should work
- post :account, :params => { :display_name => user.display_name, :image_action => "delete", :user => user.attributes }, :session => { :user => user }
+ post :account, :params => { :display_name => user.display_name, :avatar_action => "delete", :user => user.attributes }, :session => { :user => user }
assert_response :success
assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked]", false
+ assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=avatar_action][checked]", false
# Adding external authentication should redirect to the auth provider
post :account, :params => { :display_name => user.display_name, :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }, :session => { :user => user }
# Test a normal user
user = create(:user, :home_lon => 1.1, :home_lat => 1.1)
friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2)
- create(:friend, :befriender => user, :befriendee => friend_user)
+ create(:friendship, :befriender => user, :befriendee => friend_user)
create(:changeset, :user => friend_user)
get :show, :params => { :display_name => user.display_name }
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
+ assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
# When not logged in a GET should ask us to login
get :make_friend, :params => { :display_name => friend.display_name }
# When not logged in a POST should error
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
+ assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
# When logged in a GET should get a confirmation page
get :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
assert_select "input[type='hidden'][name='referer']", 0
assert_select "input[type='submit']", 1
end
- assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
# When logged in a POST should add the friendship
assert_difference "ActionMailer::Base.deliveries.size", 1 do
end
assert_redirected_to user_path(friend)
assert_match(/is now your friend/, flash[:notice])
- assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert Friendship.where(:befriender => user, :befriendee => friend).first
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
assert_equal friend.email, email.to.first
end
assert_redirected_to user_path(friend)
assert_match(/You are already friends with/, flash[:warning])
- assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert Friendship.where(:befriender => user, :befriendee => friend).first
end
def test_make_friend_with_referer
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
+ assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
# The GET should preserve any referer
get :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
assert_select "input[type='hidden'][name='referer'][value='/test']", 1
assert_select "input[type='submit']", 1
end
- assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
# When logged in a POST should add the friendship and refer us
assert_difference "ActionMailer::Base.deliveries.size", 1 do
end
assert_redirected_to "/test"
assert_match(/is now your friend/, flash[:notice])
- assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert Friendship.where(:befriender => user, :befriendee => friend).first
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
assert_equal friend.email, email.to.first
# Get users to work with
user = create(:user)
friend = create(:user)
- create(:friend, :befriender => user, :befriendee => friend)
+ create(:friendship, :befriender => user, :befriendee => friend)
# Check that the users are friends
- assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert Friendship.where(:befriender => user, :befriendee => friend).first
# When not logged in a GET should ask us to login
get :remove_friend, :params => { :display_name => friend.display_name }
# When not logged in a POST should error
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
+ assert Friendship.where(:befriender => user, :befriendee => friend).first
# When logged in a GET should get a confirmation page
get :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
assert_select "input[type='hidden'][name='referer']", 0
assert_select "input[type='submit']", 1
end
- assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert Friendship.where(:befriender => user, :befriendee => friend).first
# When logged in a POST should remove the friendship
post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
assert_redirected_to user_path(friend)
assert_match(/was removed from your friends/, flash[:notice])
- assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
# A second POST should report that the friendship does not exist
post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
assert_redirected_to user_path(friend)
assert_match(/is not one of your friends/, flash[:error])
- assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
end
def test_remove_friend_with_referer
# Get users to work with
user = create(:user)
friend = create(:user)
- create(:friend, :user_id => user.id, :friend_user_id => friend.id)
+ create(:friendship, :befriender => user, :befriendee => friend)
# Check that the users are friends
- assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert Friendship.where(:befriender => user, :befriendee => friend).first
# The GET should preserve any referer
get :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
assert_select "input[type='hidden'][name='referer'][value='/test']", 1
assert_select "input[type='submit']", 1
end
- assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert Friendship.where(:befriender => user, :befriendee => friend).first
# When logged in a POST should remove the friendship and refer
post :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
assert_redirected_to "/test"
assert_match(/was removed from your friends/, flash[:notice])
- assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+ assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
end
def test_remove_friend_unkown_user
assert_equal "", user.description
assert_nil user.home_lat
assert_nil user.home_lon
- assert_equal false, user.image.file?
+ assert_equal false, user.avatar.attached?
assert_equal false, user.email_valid
assert_nil user.new_email
assert_nil user.auth_provider
projects / rails.git / blobdiff