require "test_helper"
class UsersControllerTest < ActionController::TestCase
- def setup
- stub_hostip_requests
- end
-
##
# test all routes which lead to this controller
def test_routes
- assert_routing(
- { :path => "/api/0.6/user/1", :method => :get },
- { :controller => "users", :action => "api_read", :id => "1" }
- )
- assert_routing(
- { :path => "/api/0.6/user/details", :method => :get },
- { :controller => "users", :action => "api_details" }
- )
- assert_routing(
- { :path => "/api/0.6/user/gpx_files", :method => :get },
- { :controller => "users", :action => "api_gpx_files" }
- )
- assert_routing(
- { :path => "/api/0.6/users", :method => :get },
- { :controller => "users", :action => "api_users" }
- )
-
assert_routing(
{ :path => "/login", :method => :get },
{ :controller => "users", :action => "login" }
assert_difference "User.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 1 do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_no_difference "User.count" do
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_response :success
assert_template "new"
- assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
+ assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email"
end
def test_new_duplicate_email_uppercase
assert_no_difference "User.count" do
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_response :success
assert_template "new"
- assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
+ assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email"
end
def test_new_duplicate_name
assert_no_difference "User.count" do
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_response :success
assert_template "new"
- assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
+ assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
end
def test_new_duplicate_name_uppercase
assert_no_difference "User.count" do
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_response :success
assert_template "new"
- assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
+ assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+ end
+
+ def test_new_blocked_domain
+ user = build(:user, :pending, :email => "user@example.net")
+ create(:acl, :domain => "example.net", :k => "no_account_creation")
+
+ assert_no_difference "User.count" do
+ assert_no_difference "ActionMailer::Base.deliveries.size" do
+ perform_enqueued_jobs do
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
+ end
+ end
+ end
+
+ assert_response :success
+ assert_template "blocked"
end
def test_save_referer_params
assert_difference "ActionMailer::Base.deliveries.size", 1 do
perform_enqueued_jobs do
post :save, :session => { :new_user => user,
- :referer => "/edit?editor=id#map=1/2/3" }
+ :referer => "/edit?editor=id#map=1/2/3" },
+ :params => { :read_ct => 1, :read_tou => 1 }
end
end
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]
def test_confirm_success_no_token_with_referer
user = create(:user, :pending)
stub_gravatar_request(user.email)
- confirm_string = user.tokens.create(:referer => diary_new_path).token
+ confirm_string = user.tokens.create(:referer => new_diary_entry_path).token
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to login_path(:referer => diary_new_path)
+ assert_redirected_to login_path(:referer => new_diary_entry_path)
assert_match(/Confirmed your account/, flash[:notice])
end
def test_confirm_success_good_token_with_referer
user = create(:user, :pending)
stub_gravatar_request(user.email)
- confirm_string = user.tokens.create(:referer => diary_new_path).token
+ confirm_string = user.tokens.create(:referer => new_diary_entry_path).token
token = user.tokens.create.token
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token }
- assert_redirected_to diary_new_path
+ assert_redirected_to new_diary_entry_path
end
def test_confirm_success_bad_token_with_referer
user = create(:user, :pending)
stub_gravatar_request(user.email)
- confirm_string = user.tokens.create(:referer => diary_new_path).token
+ confirm_string = user.tokens.create(:referer => new_diary_entry_path).token
token = create(:user).tokens.create.token
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token }
- assert_redirected_to login_path(:referer => diary_new_path)
+ assert_redirected_to login_path(:referer => new_diary_entry_path)
assert_match(/Confirmed your account/, flash[:notice])
end
def test_confirm_already_confirmed
user = create(:user)
- confirm_string = user.tokens.create(:referer => diary_new_path).token
+ confirm_string = user.tokens.create(:referer => new_diary_entry_path).token
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
end
def test_terms_not_seen_without_referer
- user = create(:user, :terms_seen => false)
+ user = create(:user, :terms_seen => false, :terms_agreed => nil)
session[:user] = user.id
assert_response :success
assert_template :terms
- post :save, :params => { :user => { :consider_pd => true } }
+ post :save, :params => { :user => { :consider_pd => true }, :read_ct => 1, :read_tou => 1 }
assert_response :redirect
assert_redirected_to :action => :account, :display_name => user.display_name
assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
end
def test_terms_not_seen_with_referer
- user = create(:user, :terms_seen => false)
+ user = create(:user, :terms_seen => false, :terms_agreed => nil)
session[:user] = user.id
assert_response :success
assert_template :terms
- post :save, :params => { :user => { :consider_pd => true }, :referer => "/test" }
+ post :save, :params => { :user => { :consider_pd => true }, :referer => "/test", :read_ct => 1, :read_tou => 1 }
assert_response :redirect
assert_redirected_to "/test"
assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
# Check that if you haven't seen the terms, and make a request that requires authentication,
# that your request is redirected to view the terms
def test_terms_not_seen_redirection
- user = create(:user, :terms_seen => false)
+ user = create(:user, :terms_seen => false, :terms_agreed => nil)
session[:user] = user.id
get :account, :params => { :display_name => user.display_name }
assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
+ assert_select "form#accountForm > fieldset > div.standard-form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
# Changing to a invalid editor should fail
user.preferred_editor = "unknown"
assert_template :account
assert_select ".notice", false
assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected]", false
+ assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false
# Changing to a valid editor should work
user.preferred_editor = "potlatch2"
assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected][value=?]", "potlatch2"
+ assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected][value=?]", "potlatch2"
# Changing to the default editor should work
user.preferred_editor = "default"
assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected]", false
+ assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false
# Changing to an uploaded image should work
image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif")
- post :account, :params => { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, :session => { :user => user }
+ 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.standard-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.standard-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.standard-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 }
assert_template :account
assert_select ".notice", false
assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name"
+ assert_select "form#accountForm > fieldset > div.standard-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 => create(:user).display_name.upcase)
assert_template :account
assert_select ".notice", false
assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name"
+ assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
# Changing name to one that doesn't exist should work
new_attributes = user.attributes.dup.merge(:display_name => "new tester")
assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", "new tester"
+ assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_display_name[value=?]", "new tester"
# Record the change of name
user.display_name = "new tester"
assert_template :account
assert_select ".notice", false
assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email"
+ assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
# Changing email to one that exists should fail, regardless of case
user.new_email = create(:user).email.upcase
assert_template :account
assert_select ".notice", false
assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email"
+ assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
# Changing email to one that doesn't exist should work
user.new_email = "new_tester@example.com"
assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email
+ assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_new_email[value=?]", user.new_email
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
assert_equal user.new_email, email.to.first
# 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 }
assert_response :success
assert_select "div#userinformation" do
# 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)
+ seen_user = create(:user, :terms_seen => true, :terms_agreed => nil)
+ not_seen_user = create(:user, :terms_seen => false, :terms_agreed => nil)
get :show, :params => { :display_name => agreed_user.display_name }
assert_response :success
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, :params => { :id => user.id }
- assert_response :success
- assert_equal "text/xml", response.content_type
-
- # check the data that is returned
- assert_select "description", :count => 1, :text => "test"
- assert_select "contributor-terms", :count => 1 do
- assert_select "[agreed='true']"
- end
- assert_select "img", :count => 0
- assert_select "roles", :count => 1 do
- assert_select "role", :count => 0
- end
- assert_select "changesets", :count => 1 do
- assert_select "[count='0']"
- end
- assert_select "traces", :count => 1 do
- assert_select "[count='0']"
- end
- assert_select "blocks", :count => 1 do
- assert_select "received", :count => 1 do
- assert_select "[count='0'][active='0']"
- end
- assert_select "issued", :count => 0
- end
-
- # check that we aren't revealing private information
- assert_select "contributor-terms[pd]", false
- assert_select "home", false
- assert_select "languages", false
- assert_select "messages", false
-
- # check that a suspended user is not returned
- get :api_read, :params => { :id => create(:user, :suspended).id }
- assert_response :gone
-
- # check that a deleted user is not returned
- get :api_read, :params => { :id => create(:user, :deleted).id }
- assert_response :gone
-
- # check that a non-existent user is not returned
- 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 user.email, "test"
- get :api_details
- assert_response :success
- assert_equal "text/xml", response.content_type
-
- # check the data that is returned
- assert_select "description", :count => 1, :text => "test"
- assert_select "contributor-terms", :count => 1 do
- assert_select "[agreed='true'][pd='false']"
- end
- assert_select "img", :count => 0
- assert_select "roles", :count => 1 do
- assert_select "role", :count => 0
- end
- assert_select "changesets", :count => 1 do
- assert_select "[count='0']", :count => 1
- end
- assert_select "traces", :count => 1 do
- assert_select "[count='0']", :count => 1
- end
- assert_select "blocks", :count => 1 do
- assert_select "received", :count => 1 do
- assert_select "[count='0'][active='0']"
- end
- assert_select "issued", :count => 0
- end
- assert_select "home", :count => 1 do
- assert_select "[lat='12.1'][lon='12.1'][zoom='3']"
- end
- assert_select "languages", :count => 1 do
- assert_select "lang", :count => 1, :text => "en"
- end
- assert_select "messages", :count => 1 do
- assert_select "received", :count => 1 do
- assert_select "[count='1'][unread='0']"
- end
- assert_select "sent", :count => 1 do
- assert_select "[count='1']"
- end
- end
- end
-
- def test_api_users
- user1 = create(:user, :description => "test1", :terms_agreed => Date.yesterday)
- user2 = create(:user, :description => "test2", :terms_agreed => Date.yesterday)
- user3 = create(:user, :description => "test3", :terms_agreed => Date.yesterday)
-
- get :api_users, :params => { :users => user1.id }
- assert_response :success
- assert_equal "text/xml", response.content_type
- assert_select "user", :count => 1 do
- assert_select "user[id='#{user1.id}']", :count => 1
- assert_select "user[id='#{user2.id}']", :count => 0
- assert_select "user[id='#{user3.id}']", :count => 0
- end
-
- get :api_users, :params => { :users => user2.id }
- assert_response :success
- assert_equal "text/xml", response.content_type
- assert_select "user", :count => 1 do
- assert_select "user[id='#{user1.id}']", :count => 0
- assert_select "user[id='#{user2.id}']", :count => 1
- assert_select "user[id='#{user3.id}']", :count => 0
- end
-
- get :api_users, :params => { :users => "#{user1.id},#{user3.id}" }
- assert_response :success
- assert_equal "text/xml", response.content_type
- assert_select "user", :count => 2 do
- assert_select "user[id='#{user1.id}']", :count => 1
- assert_select "user[id='#{user2.id}']", :count => 0
- assert_select "user[id='#{user3.id}']", :count => 1
- end
-
- get :api_users, :params => { :users => create(:user, :suspended).id }
- assert_response :not_found
-
- get :api_users, :params => { :users => create(:user, :deleted).id }
- assert_response :not_found
-
- get :api_users, :params => { :users => 0 }
- assert_response :not_found
- end
-
- def test_api_gpx_files
- user = create(:user)
- trace1 = create(:trace, :user => user) do |trace|
- create(:tracetag, :trace => trace, :tag => "London")
- end
- trace2 = create(:trace, :user => user) do |trace|
- create(:tracetag, :trace => trace, :tag => "Birmingham")
- end
- # check that nothing is returned when not logged in
- get :api_gpx_files
- assert_response :unauthorized
-
- # check that we get a response when logged in
- basic_authorization user.email, "test"
- get :api_gpx_files
- assert_response :success
- assert_equal "application/xml", response.content_type
-
- # check the data that is returned
- assert_select "gpx_file[id='#{trace1.id}']", 1 do
- assert_select "tag", "London"
- end
- assert_select "gpx_file[id='#{trace2.id}']", 1 do
- assert_select "tag", "Birmingham"
- end
- end
-
def test_make_friend
# Get users to work with
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
+ 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
# Now try as a normal user
get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :show, :display_name => user.display_name
+ assert_redirected_to :controller => :errors, :action => :forbidden
# Finally try as an administrator
get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }
# Now try as a normal user
get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :show, :display_name => user.display_name
+ assert_redirected_to :controller => :errors, :action => :forbidden
# Finally try as an administrator
get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_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
# Shouldn't work when logged in as a normal user
get :index
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
session[:user] = moderator_user.id
# Shouldn't work when logged in as a moderator
get :index
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
session[:user] = administrator_user.id
assert_no_difference "User.active.count" do
post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
- assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_response :forbidden
+
assert_equal "pending", inactive_user.reload.status
assert_equal "suspended", suspended_user.reload.status
post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal "pending", inactive_user.reload.status
assert_equal "suspended", suspended_user.reload.status
post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal "pending", inactive_user.reload.status
assert_equal "suspended", suspended_user.reload.status
assert_no_difference "User.active.count" do
post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
- assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_response :forbidden
+
assert_equal "active", normal_user.reload.status
assert_equal "confirmed", confirmed_user.reload.status
post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal "active", normal_user.reload.status
assert_equal "confirmed", confirmed_user.reload.status
post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal "active", normal_user.reload.status
assert_equal "confirmed", confirmed_user.reload.status
projects / rails.git / blobdiff