{ :controller => "users", :action => "save" }
)
- assert_routing(
- { :path => "/user/username/confirm", :method => :get },
- { :controller => "users", :action => "confirm", :display_name => "username" }
- )
- assert_routing(
- { :path => "/user/username/confirm", :method => :post },
- { :controller => "users", :action => "confirm", :display_name => "username" }
- )
- assert_routing(
- { :path => "/user/username/confirm/resend", :method => :get },
- { :controller => "users", :action => "confirm_resend", :display_name => "username" }
- )
-
- assert_routing(
- { :path => "/user/confirm", :method => :get },
- { :controller => "users", :action => "confirm" }
- )
- assert_routing(
- { :path => "/user/confirm", :method => :post },
- { :controller => "users", :action => "confirm" }
- )
- assert_routing(
- { :path => "/user/confirm-email", :method => :get },
- { :controller => "users", :action => "confirm_email" }
- )
- assert_routing(
- { :path => "/user/confirm-email", :method => :post },
- { :controller => "users", :action => "confirm_email" }
- )
-
assert_routing(
{ :path => "/user/go_public", :method => :post },
{ :controller => "users", :action => "go_public" }
{ :controller => "users", :action => "show", :display_name => "username" }
)
- assert_routing(
- { :path => "/user/username/account", :method => :get },
- { :controller => "users", :action => "account", :display_name => "username" }
- )
- assert_routing(
- { :path => "/user/username/account", :method => :post },
- { :controller => "users", :action => "account", :display_name => "username" }
- )
-
assert_routing(
{ :path => "/user/username/set_status", :method => :post },
{ :controller => "users", :action => "set_status", :display_name => "username" }
assert_match(/#{@url}/, register_email.body.to_s)
# Check the page
- assert_redirected_to :action => "confirm", :display_name => user.display_name
+ assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => user.display_name
ActionMailer::Base.deliveries.clear
end
assert_response :success
assert_template "new"
- assert_select "form > div.form-group > input.is-invalid#user_email"
+ assert_select "form > div > input.is-invalid#user_email"
end
def test_save_duplicate_email
assert_response :success
assert_template "new"
- assert_select "form > div.form-group > input.is-invalid#user_email"
+ assert_select "form > div > input.is-invalid#user_email"
end
def test_save_duplicate_email_uppercase
assert_response :success
assert_template "new"
- assert_select "form > div.form-group > input.is-invalid#user_email"
+ assert_select "form > div > input.is-invalid#user_email"
end
def test_save_duplicate_name
assert_response :success
assert_template "new"
- assert_select "form > div.form-group > input.is-invalid#user_display_name"
+ assert_select "form > div > input.is-invalid#user_display_name"
end
def test_save_duplicate_name_uppercase
assert_response :success
assert_template "new"
- assert_select "form > div.form-group > input.is-invalid#user_display_name"
+ assert_select "form > div > input.is-invalid#user_display_name"
end
def test_save_blocked_domain
ActionMailer::Base.deliveries.clear
end
- def test_confirm_get
- user = build(:user, :pending)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create.token
-
- get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_response :success
- assert_template :confirm
- end
-
- def test_confirm_get_already_confirmed
- user = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create.token
-
- # Get the confirmation page
- get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_response :success
- assert_template :confirm
-
- # Confirm the user
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to welcome_path
-
- # Now try to get the confirmation page again
- get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_response :redirect
- assert_redirected_to root_path
- end
-
- def test_confirm_success_no_token_no_referer
- user = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create.token
-
- post logout_path
-
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to login_path
- assert_match(/Confirmed your account/, flash[:notice])
- end
-
- def test_confirm_success_good_token_no_referer
- user = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create.token
-
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to welcome_path
- end
-
- def test_confirm_success_bad_token_no_referer
- user = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create.token
-
- post logout_path
- session_for(create(:user))
-
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to login_path
- assert_match(/Confirmed your account/, flash[:notice])
- end
-
- def test_confirm_success_no_token_with_referer
- user = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create(:referer => new_diary_entry_path).token
-
- post logout_path
-
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- 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 = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create(:referer => new_diary_entry_path).token
-
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to new_diary_entry_path
- end
-
- def test_confirm_success_bad_token_with_referer
- user = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create(:referer => new_diary_entry_path).token
-
- post logout_path
- session_for(create(:user))
-
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to login_path(:referer => new_diary_entry_path)
- assert_match(/Confirmed your account/, flash[:notice])
- end
-
- def test_confirm_expired_token
- user = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create(:expiry => 1.day.ago).token
-
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to :action => "confirm"
- assert_match(/confirmation code has expired/, flash[:error])
- end
-
- def test_confirm_already_confirmed
- user = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create(:referer => new_diary_entry_path).token
-
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to new_diary_entry_path
-
- post logout_path
-
- confirm_string = User.find_by(:email => user.email).tokens.create(:referer => new_diary_entry_path).token
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to login_path
- assert_match(/already been confirmed/, flash[:error])
- end
-
- def test_confirm_deleted
- user = build(:user, :pending)
- stub_gravatar_request(user.email)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
- confirm_string = User.find_by(:email => user.email).tokens.create.token
-
- User.find_by(:display_name => user.display_name).update(:status => "deleted")
-
- # Get the confirmation page
- get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_response :redirect
- assert_redirected_to root_path
-
- # Confirm the user
- post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_response :not_found
- assert_template :no_such_user
- end
-
- def test_confirm_resend_success
- user = build(:user, :pending)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
-
- assert_difference "ActionMailer::Base.deliveries.size", 1 do
- perform_enqueued_jobs do
- get user_confirm_resend_path(user)
- end
- end
-
- assert_response :redirect
- assert_redirected_to login_path
- assert_match(/sent a new confirmation/, flash[:notice])
-
- email = ActionMailer::Base.deliveries.last
-
- assert_equal user.email, email.to.first
-
- ActionMailer::Base.deliveries.clear
- end
-
- def test_confirm_resend_no_token
- user = build(:user, :pending)
- # only complete first half of registration
- post user_new_path, :params => { :user => user.attributes }
-
- assert_no_difference "ActionMailer::Base.deliveries.size" do
- perform_enqueued_jobs do
- get user_confirm_resend_path(user)
- end
- end
-
- assert_response :redirect
- assert_redirected_to login_path
- assert_match "User #{user.display_name} not found.", flash[:error]
- end
-
- def test_confirm_resend_deleted
- user = build(:user, :pending)
- post user_new_path, :params => { :user => user.attributes }
- post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
-
- User.find_by(:display_name => user.display_name).update(:status => "deleted")
-
- assert_no_difference "ActionMailer::Base.deliveries.size" do
- perform_enqueued_jobs do
- get user_confirm_resend_path(user)
- end
- end
-
- assert_response :redirect
- assert_redirected_to login_path
- assert_match "User #{user.display_name} not found.", flash[:error]
- end
-
- def test_confirm_resend_unknown_user
- assert_no_difference "ActionMailer::Base.deliveries.size" do
- perform_enqueued_jobs do
- get user_confirm_resend_path(:display_name => "No Such User")
- end
- end
-
- assert_response :redirect
- assert_redirected_to login_path
- assert_match "User No Such User not found.", flash[:error]
- end
-
- def test_confirm_email_get
- user = create(:user)
- confirm_string = user.tokens.create.token
-
- get user_confirm_email_path, :params => { :confirm_string => confirm_string }
- assert_response :success
- assert_template :confirm_email
- end
-
- def test_confirm_email_success
- user = create(:user, :new_email => "test-new@example.com")
- stub_gravatar_request(user.new_email)
- confirm_string = user.tokens.create.token
-
- post user_confirm_email_path, :params => { :confirm_string => confirm_string }
- assert_response :redirect
- assert_redirected_to :action => :account, :display_name => user.display_name
- assert_match(/Confirmed your change of email address/, flash[:notice])
- end
-
- def test_confirm_email_already_confirmed
- user = create(:user)
- confirm_string = user.tokens.create.token
-
- post user_confirm_email_path, :params => { :confirm_string => confirm_string }
- assert_response :redirect
- assert_redirected_to :action => :account, :display_name => user.display_name
- assert_match(/already been confirmed/, flash[:error])
- end
-
- def test_confirm_email_bad_token
- post user_confirm_email_path, :params => { :confirm_string => "XXXXX" }
- assert_response :success
- assert_template :confirm_email
- 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 = create(:user, :new_email => "test-new@example.com")
- stub_gravatar_request(user.new_email, 200)
- confirm_string = user.tokens.create.token
- # precondition gravatar should be turned off
- assert_not user.image_use_gravatar
- post user_confirm_email_path, :params => { :confirm_string => confirm_string }
- assert_response :redirect
- assert_redirected_to :action => :account, :display_name => user.display_name
- assert_match(/Confirmed your change of email address/, flash[:notice])
- # gravatar use should now be enabled
- assert User.find(user.id).image_use_gravatar
- end
-
- def test_gravatar_auto_disable
- # switch to email without a gravatar
- user = create(:user, :new_email => "test-new@example.com", :image_use_gravatar => true)
- stub_gravatar_request(user.new_email, 404)
- confirm_string = user.tokens.create.token
- # precondition gravatar should be turned on
- assert user.image_use_gravatar
- post user_confirm_email_path, :params => { :confirm_string => confirm_string }
- assert_response :redirect
- assert_redirected_to :action => :account, :display_name => user.display_name
- assert_match(/Confirmed your change of email address/, flash[:notice])
- # gravatar use should now be disabled
- assert_not User.find(user.id).image_use_gravatar
- end
-
def test_terms_new_user
user = build(:user, :pending)
get user_terms_path
assert_response :redirect
- assert_redirected_to :action => :account, :display_name => user.display_name
+ assert_redirected_to edit_account_path
end
def test_terms_not_seen_without_referer
post user_save_path, :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_redirected_to edit_account_path
assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
user.reload
user = create(:user, :terms_seen => false, :terms_agreed => nil)
session_for(user)
- get user_account_path(user)
+ get edit_account_path
assert_response :redirect
- assert_redirected_to :action => :terms, :referer => "/user/#{ERB::Util.u(user.display_name)}/account"
+ assert_redirected_to :controller => :users, :action => :terms, :referer => "/account/edit"
+ end
+
+ def test_terms_not_logged_in
+ get user_terms_path
+
+ assert_redirected_to login_path(:referer => "/user/terms")
end
def test_go_public
post user_go_public_path
assert_response :redirect
- assert_redirected_to :action => :account, :display_name => user.display_name
+ assert_redirected_to edit_account_path
assert User.find(user.id).data_public
end
- def test_account
- # Get a user to work with - note that this user deliberately
- # conflicts with uppercase_user in the email and display name
- # fields to test that we can change other fields without any
- # validation errors being reported
- user = create(:user, :languages => [])
- _uppercase_user = build(:user, :email => user.email.upcase, :display_name => user.display_name.upcase).tap { |u| u.save(:validate => false) }
-
- # Make sure that you are redirected to the login page when
- # you are not logged in
- get user_account_path(user)
- assert_response :redirect
- assert_redirected_to login_path(:referer => "/user/#{ERB::Util.u(user.display_name)}/account")
-
- # Make sure that you are blocked when not logged in as the right user
- session_for(create(:user))
- get user_account_path(user)
- assert_response :forbidden
-
- # Make sure we get the page when we are logged in as the right user
- session_for(user)
- get user_account_path(user)
- assert_response :success
- assert_template :account
- assert_select "form#accountForm" do |form|
- assert_equal "post", form.attr("method").to_s
- assert_select "input[name='_method']", false
- assert_equal "/user/#{ERB::Util.u(user.display_name)}/account", form.attr("action").to_s
- end
-
- # Updating the description using GET should fail
- user.description = "new description"
- user.preferred_editor = "default"
- get user_account_path(user), :params => { :user => user.attributes }
- assert_response :success
- assert_template :account
- assert_not_equal user.description, User.find(user.id).description
-
- # Updating the description should work
- 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 ".notice", /^User information updated successfully/
- 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"
- post user_account_path(user), :params => { :user => user.attributes }
- assert_response :success
- assert_template :account
- assert_select ".notice", 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 = "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 ".notice", /^User information updated successfully/
- 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 ".notice", /^User information updated successfully/
- 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 ".notice", /^User information updated successfully/
- 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 ".notice", /^User information updated successfully/
- 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 ".notice", /^User information updated successfully/
- 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 :redirect
- assert_redirected_to auth_path(:provider => "openid", :openid_url => "https://www.google.com/accounts/o8/id", :origin => "/user/#{ERB::Util.u(user.display_name)}/account")
-
- # Changing name to one that exists should fail
- new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name)
- post user_account_path(user), :params => { :user => new_attributes }
- assert_response :success
- assert_template :account
- assert_select ".notice", false
- 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)
- post user_account_path(user), :params => { :user => new_attributes }
- assert_response :success
- assert_template :account
- assert_select ".notice", false
- 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 ".notice", /^User information updated successfully/
- assert_select "form#accountForm > div.form-group > input#user_display_name[value=?]", "new tester"
-
- # Record the change of name
- user.display_name = "new tester"
-
- # Changing email to one that exists should fail
- user.new_email = create(:user).email
- assert_no_difference "ActionMailer::Base.deliveries.size" do
- perform_enqueued_jobs do
- post user_account_path(user), :params => { :user => user.attributes }
- end
- end
- assert_response :success
- assert_template :account
- assert_select ".notice", false
- 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_no_difference "ActionMailer::Base.deliveries.size" do
- perform_enqueued_jobs do
- post user_account_path(user), :params => { :user => user.attributes }
- end
- end
- assert_response :success
- assert_template :account
- assert_select ".notice", false
- 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"
- assert_difference "ActionMailer::Base.deliveries.size", 1 do
- perform_enqueued_jobs do
- 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 ".notice", /^User information updated successfully/
- 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
- ActionMailer::Base.deliveries.clear
- end
-
# Check that the user account page will display and contains some relevant
# information for the user
def test_show
assert_response :not_found
# 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(:friendship, :befriender => user, :befriendee => friend_user)
- create(:changeset, :user => friend_user)
+ user = create(:user)
get user_path(user)
assert_response :success
- assert_select "div#userinformation" do
+ assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
create(:user_block, :user => blocked_user)
get user_path(blocked_user)
assert_response :success
- assert_select "div#userinformation" do
+ assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(blocked_user.display_name)}/history']", 1
assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/traces']", 1
assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary']", 1
create(:user_block, :creator => moderator_user)
get user_path(moderator_user)
assert_response :success
- assert_select "div#userinformation" do
+ assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(moderator_user.display_name)}/history']", 1
assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/traces']", 1
assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary']", 1
# Test the normal user
get user_path(user)
assert_response :success
- assert_select "div#userinformation" do
+ assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
assert_select "a[href='/traces/mine']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1
- assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/account']", 1
+ assert_select "a[href='/account/edit']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0
assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0
- end
-
- # Friends should be visible as we're now logged in
- assert_select "div#friends-container" do
- assert_select "div.contact-activity", :count => 1
+ assert_select "a[href='/api/0.6/user/#{ERB::Util.u(user.id)}']", 0
end
# Login as a moderator
# Test the normal user
get user_path(user)
assert_response :success
- assert_select "div#userinformation" do
+ assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1
- assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/account']", 0
+ assert_select "a[href='/account/edit']", 0
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0
assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 1
+ assert_select "a[href='/api/0.6/user/#{ERB::Util.u(user.id)}']", 1
end
end
get user_path(agreed_user)
assert_response :success
- assert_select "div#userinformation" do
- assert_select "p", :count => 0, :text => /Contributor terms/
+ assert_select "div.content-heading" do
+ assert_select "dt", :count => 0, :text => /Contributor terms/
end
get user_path(seen_user)
assert_response :success
- # put @response.body
- assert_select "div#userinformation" do
- assert_select "p", :count => 1, :text => /Contributor terms/
- assert_select "p", /Declined/
+ assert_select "div.content-heading" do
+ assert_select "dt", :count => 1, :text => /Contributor terms/
+ assert_select "dd", /Declined/
end
get user_path(not_seen_user)
assert_response :success
- assert_select "div#userinformation" do
- assert_select "p", :count => 1, :text => /Contributor terms/
- assert_select "p", /Undecided/
+ assert_select "div.content-heading" do
+ assert_select "dt", :count => 1, :text => /Contributor terms/
+ assert_select "dd", /Undecided/
end
end
user = create(:user)
# Try without logging in
- post set_status_user_path(user), :params => { :status => "suspended" }
+ post set_status_user_path(user), :params => { :event => "confirm" }
assert_response :forbidden
# Now try as a normal user
session_for(user)
- post set_status_user_path(user), :params => { :status => "suspended" }
+ post set_status_user_path(user), :params => { :event => "confirm" }
assert_response :redirect
assert_redirected_to :controller => :errors, :action => :forbidden
# Finally try as an administrator
session_for(create(:administrator_user))
- post set_status_user_path(user), :params => { :status => "suspended" }
+ post set_status_user_path(user), :params => { :event => "confirm" }
assert_response :redirect
assert_redirected_to :action => :show, :display_name => user.display_name
- assert_equal "suspended", User.find(user.id).status
+ assert_equal "confirmed", User.find(user.id).status
end
def test_destroy
user = create(:user, :home_lat => 12.1, :home_lon => 12.1, :description => "test")
# Try without logging in
- delete user_path(user), :params => { :status => "suspended" }
+ delete user_path(user)
assert_response :forbidden
# Now try as a normal user
session_for(user)
- delete user_path(user), :params => { :status => "suspended" }
+ delete user_path(user)
assert_response :redirect
assert_redirected_to :controller => :errors, :action => :forbidden
# Finally try as an administrator
session_for(create(:administrator_user))
- delete user_path(user), :params => { :status => "suspended" }
+ delete user_path(user)
assert_response :redirect
assert_redirected_to :action => :show, :display_name => user.display_name
assert_equal "deleted", normal_user.reload.status
assert_equal "deleted", confirmed_user.reload.status
end
+
+ def test_auth_failure_callback
+ get auth_failure_path
+ assert_response :redirect
+ assert_redirected_to login_path
+
+ get auth_failure_path, :params => { :origin => "/" }
+ assert_response :redirect
+ assert_redirected_to root_path
+
+ get auth_failure_path, :params => { :origin => "http://www.google.com" }
+ assert_response :redirect
+ assert_redirected_to login_path
+ end
end
projects / rails.git / blobdiff