)
assert_routing(
- { :path => "/user/username/make_friend", :method => :get },
- { :controller => "users", :action => "make_friend", :display_name => "username" }
- )
- assert_routing(
- { :path => "/user/username/make_friend", :method => :post },
- { :controller => "users", :action => "make_friend", :display_name => "username" }
- )
- assert_routing(
- { :path => "/user/username/remove_friend", :method => :get },
- { :controller => "users", :action => "remove_friend", :display_name => "username" }
- )
- assert_routing(
- { :path => "/user/username/remove_friend", :method => :post },
- { :controller => "users", :action => "remove_friend", :display_name => "username" }
- )
-
- assert_routing(
- { :path => "/user/username/set_status", :method => :get },
+ { :path => "/user/username/set_status", :method => :post },
{ :controller => "users", :action => "set_status", :display_name => "username" }
)
assert_routing(
- { :path => "/user/username/delete", :method => :get },
- { :controller => "users", :action => "delete", :display_name => "username" }
+ { :path => "/user/username", :method => :delete },
+ { :controller => "users", :action => "destroy", :display_name => "username" }
)
assert_routing(
assert_response :success
assert_template "new"
- assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email"
+ assert_select "form > div.form-group > input.is-invalid#user_email"
end
def test_save_duplicate_email
assert_response :success
assert_template "new"
- assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email"
+ assert_select "form > div.form-group > input.is-invalid#user_email"
end
def test_save_duplicate_email_uppercase
assert_response :success
assert_template "new"
- assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email"
+ assert_select "form > div.form-group > input.is-invalid#user_email"
end
def test_save_duplicate_name
assert_response :success
assert_template "new"
- assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+ assert_select "form > div.form-group > input.is-invalid#user_display_name"
end
def test_save_duplicate_name_uppercase
assert_response :success
assert_template "new"
- assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+ assert_select "form > div.form-group > input.is-invalid#user_display_name"
end
def test_save_blocked_domain
get logout_path
assert_response :success
assert_template :logout
- assert_select "input[name=referer][value=?]", ""
+ assert_select "input[name=referer]:not([value])"
end
def test_logout_fallback_with_referer
assert_difference "ActionMailer::Base.deliveries.size", 1 do
perform_enqueued_jobs do
- post user_forgot_password_path, :params => { :user => { :email => user.email } }
+ post user_forgot_password_path, :params => { :email => user.email }
end
end
assert_response :redirect
# that has the same address in a different case
assert_difference "ActionMailer::Base.deliveries.size", 1 do
perform_enqueued_jobs do
- post user_forgot_password_path, :params => { :user => { :email => user.email.upcase } }
+ post user_forgot_password_path, :params => { :email => user.email.upcase }
end
end
assert_response :redirect
# for more than one user but not an exact match for either
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post user_forgot_password_path, :params => { :user => { :email => user.email.titlecase } }
+ post user_forgot_password_path, :params => { :email => user.email.titlecase }
end
end
assert_response :success
third_user = create(:user)
assert_difference "ActionMailer::Base.deliveries.size", 1 do
perform_enqueued_jobs do
- post user_forgot_password_path, :params => { :user => { :email => third_user.email } }
+ post user_forgot_password_path, :params => { :email => third_user.email }
end
end
assert_response :redirect
# same (case insensitively unique) address in a different case
assert_difference "ActionMailer::Base.deliveries.size", 1 do
perform_enqueued_jobs do
- post user_forgot_password_path, :params => { :user => { :email => third_user.email.upcase } }
+ post user_forgot_password_path, :params => { :email => third_user.email.upcase }
end
end
assert_response :redirect
post user_reset_password_path, :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"
+ assert_select "div.invalid-feedback"
# Test setting a new password
post user_reset_password_path, :params => { :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" } }
user.description = "new description"
user.preferred_editor = "default"
post user_account_path(user), :params => { :user => user.attributes }
+ assert_response :redirect
+ assert_redirected_to user_account_url(user)
+ get user_account_path(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.standard-form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
+ assert_select "form#accountForm > div.form-group > 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_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false
+ assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected]", false
# Changing to a valid editor should work
- user.preferred_editor = "potlatch2"
+ user.preferred_editor = "id"
post user_account_path(user), :params => { :user => user.attributes }
+ assert_response :redirect
+ assert_redirected_to user_account_url(user)
+ get user_account_path(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.standard-form-row > select#user_preferred_editor > option[selected][value=?]", "potlatch2"
+ assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected][value=?]", "id"
# Changing to the default editor should work
user.preferred_editor = "default"
post user_account_path(user), :params => { :user => user.attributes }
+ assert_response :redirect
+ assert_redirected_to user_account_url(user)
+ get user_account_path(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.standard-form-row > select#user_preferred_editor > option[selected]", false
+ assert_select "form#accountForm > div.form-group > 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 user_account_path(user), :params => { :avatar_action => "new", :user => user.attributes.merge(:avatar => image) }
+ assert_response :redirect
+ assert_redirected_to user_account_url(user)
+ get user_account_path(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.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "keep"
+ assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked][value=?]", "keep"
# Changing to a gravatar image should work
post user_account_path(user), :params => { :avatar_action => "gravatar", :user => user.attributes }
+ assert_response :redirect
+ assert_redirected_to user_account_url(user)
+ get user_account_path(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.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "gravatar"
+ assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked][value=?]", "gravatar"
# Removing the image should work
post user_account_path(user), :params => { :avatar_action => "delete", :user => user.attributes }
+ assert_response :redirect
+ assert_redirected_to user_account_url(user)
+ get user_account_path(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.standard-form-row.accountImage input[name=avatar_action][checked]", false
+ assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked]", false
+ assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked]", false
# Adding external authentication should redirect to the auth provider
post user_account_path(user), :params => { :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }
assert_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+ assert_select "form#accountForm > div.form-group > input.is-invalid#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_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+ assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name"
# Changing name to one that doesn't exist should work
new_attributes = user.attributes.dup.merge(:display_name => "new tester")
post user_account_path(user), :params => { :user => new_attributes }
+ assert_response :redirect
+ assert_redirected_to user_account_url(:display_name => "new tester")
+ get user_account_path(:display_name => "new tester")
assert_response :success
assert_template :account
- assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_display_name[value=?]", "new tester"
+ assert_select "form#accountForm > div.form-group > input#user_display_name[value=?]", "new tester"
# Record the change of name
user.display_name = "new tester"
assert_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
+ assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"
# Changing email to one that exists should fail, regardless of case
user.new_email = create(:user).email.upcase
assert_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
+ assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"
# Changing email to one that doesn't exist should work
user.new_email = "new_tester@example.com"
post user_account_path(user), :params => { :user => user.attributes }
end
end
+ assert_response :redirect
+ assert_redirected_to user_account_url(user)
+ get user_account_path(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.standard-form-row > input#user_new_email[value=?]", user.new_email
+ assert_select "form#accountForm > div.form-group > 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
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 Friendship.where(:befriender => user, :befriendee => friend).first
-
- # When not logged in a GET should ask us to login
- get make_friend_path(friend)
- assert_redirected_to :action => "login", :referer => make_friend_path(:display_name => friend.display_name)
-
- # When not logged in a POST should error
- post make_friend_path(friend)
- assert_response :forbidden
- assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
-
- session_for(user)
-
- # When logged in a GET should get a confirmation page
- get make_friend_path(friend)
- assert_response :success
- assert_template :make_friend
- assert_select "form" do
- assert_select "input[type='hidden'][name='referer']", 0
- assert_select "input[type='submit']", 1
- end
- assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
-
- # When logged in a POST should add the friendship
- assert_difference "ActionMailer::Base.deliveries.size", 1 do
- perform_enqueued_jobs do
- post make_friend_path(friend)
- end
- end
- assert_redirected_to user_path(friend)
- assert_match(/is now your friend/, flash[:notice])
- 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
- ActionMailer::Base.deliveries.clear
-
- # A second POST should report that the friendship already exists
- assert_no_difference "ActionMailer::Base.deliveries.size" do
- perform_enqueued_jobs do
- post make_friend_path(friend)
- end
- end
- assert_redirected_to user_path(friend)
- assert_match(/You are already friends with/, flash[:warning])
- assert Friendship.where(:befriender => user, :befriendee => friend).first
- end
-
- def test_make_friend_with_referer
- # Get users to work with
- user = create(:user)
- friend = create(:user)
- session_for(user)
-
- # Check that the users aren't already friends
- assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
-
- # The GET should preserve any referer
- get make_friend_path(friend), :params => { :referer => "/test" }
- assert_response :success
- assert_template :make_friend
- assert_select "form" do
- assert_select "input[type='hidden'][name='referer'][value='/test']", 1
- assert_select "input[type='submit']", 1
- end
- assert_nil 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
- perform_enqueued_jobs do
- post make_friend_path(friend), :params => { :referer => "/test" }
- end
- end
- assert_redirected_to "/test"
- assert_match(/is now your friend/, flash[:notice])
- 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
- ActionMailer::Base.deliveries.clear
- end
-
- def test_make_friend_unkown_user
- # Should error when a bogus user is specified
- session_for(create(:user))
- get make_friend_path(:display_name => "No Such User")
- assert_response :not_found
- assert_template :no_such_user
- end
-
- def test_remove_friend
- # Get users to work with
- user = create(:user)
- friend = create(:user)
- create(:friendship, :befriender => user, :befriendee => friend)
-
- # Check that the users are friends
- assert Friendship.where(:befriender => user, :befriendee => friend).first
-
- # When not logged in a GET should ask us to login
- get remove_friend_path(friend)
- assert_redirected_to :action => "login", :referer => remove_friend_path(:display_name => friend.display_name)
-
- # When not logged in a POST should error
- post remove_friend_path, :params => { :display_name => friend.display_name }
- assert_response :forbidden
- assert Friendship.where(:befriender => user, :befriendee => friend).first
-
- session_for(user)
-
- # When logged in a GET should get a confirmation page
- get remove_friend_path(friend)
- assert_response :success
- assert_template :remove_friend
- assert_select "form" do
- assert_select "input[type='hidden'][name='referer']", 0
- assert_select "input[type='submit']", 1
- end
- assert Friendship.where(:befriender => user, :befriendee => friend).first
-
- # When logged in a POST should remove the friendship
- post remove_friend_path(friend)
- assert_redirected_to user_path(friend)
- assert_match(/was removed from your friends/, flash[:notice])
- assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
-
- # A second POST should report that the friendship does not exist
- post remove_friend_path(friend)
- assert_redirected_to user_path(friend)
- assert_match(/is not one of your friends/, flash[:error])
- 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(:friendship, :befriender => user, :befriendee => friend)
- session_for(user)
-
- # Check that the users are friends
- assert Friendship.where(:befriender => user, :befriendee => friend).first
-
- # The GET should preserve any referer
- get remove_friend_path(friend), :params => { :referer => "/test" }
- assert_response :success
- assert_template :remove_friend
- assert_select "form" do
- assert_select "input[type='hidden'][name='referer'][value='/test']", 1
- assert_select "input[type='submit']", 1
- end
- assert Friendship.where(:befriender => user, :befriendee => friend).first
-
- # When logged in a POST should remove the friendship and refer
- post remove_friend_path(friend), :params => { :referer => "/test" }
- assert_redirected_to "/test"
- assert_match(/was removed from your friends/, flash[:notice])
- assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
- end
-
- def test_remove_friend_unkown_user
- # Should error when a bogus user is specified
- session_for(create(:user))
- get remove_friend_path(:display_name => "No Such 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_user_path(user), :params => { :status => "suspended" }
- assert_response :redirect
- assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended")
+ post set_status_user_path(user), :params => { :status => "suspended" }
+ assert_response :forbidden
# Now try as a normal user
session_for(user)
- get set_status_user_path(user), :params => { :status => "suspended" }
+ post set_status_user_path(user), :params => { :status => "suspended" }
assert_response :redirect
assert_redirected_to :controller => :errors, :action => :forbidden
# Finally try as an administrator
session_for(create(:administrator_user))
- get set_status_user_path(user), :params => { :status => "suspended" }
+ post set_status_user_path(user), :params => { :status => "suspended" }
assert_response :redirect
assert_redirected_to :action => :show, :display_name => user.display_name
assert_equal "suspended", User.find(user.id).status
end
- def test_delete
+ def test_destroy
user = create(:user, :home_lat => 12.1, :home_lon => 12.1, :description => "test")
# Try without logging in
- get delete_user_path(user), :params => { :status => "suspended" }
- assert_response :redirect
- assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended")
+ delete user_path(user), :params => { :status => "suspended" }
+ assert_response :forbidden
# Now try as a normal user
session_for(user)
- get delete_user_path(user), :params => { :status => "suspended" }
+ delete user_path(user), :params => { :status => "suspended" }
assert_response :redirect
assert_redirected_to :controller => :errors, :action => :forbidden
# Finally try as an administrator
session_for(create(:administrator_user))
- get delete_user_path(user), :params => { :status => "suspended" }
+ delete user_path(user), :params => { :status => "suspended" }
assert_response :redirect
assert_redirected_to :action => :show, :display_name => user.display_name
projects / rails.git / blobdiff