{ :path => "/user/new", :method => :get },
{ :controller => "user", :action => "new" }
)
- assert_recognizes(
- { :controller => "user", :action => "new" },
- { :path => "/create-account.html", :method => :get }
- )
assert_routing(
{ :path => "/user/new", :method => :post },
{ :path => "/user/forgot-password", :method => :post },
{ :controller => "user", :action => "lost_password" }
)
- assert_recognizes(
- { :controller => "user", :action => "lost_password" },
- { :path => "/forgot-password.html", :method => :get }
- )
assert_routing(
{ :path => "/user/reset-password", :method => :get },
{ :controller => "user", :action => "reset_password" }
end
end
end
-
+
+ def new_user
+ user = User.new
+ user.status = "pending"
+ user.display_name = "new_tester"
+ user.email = "newtester@osm.org"
+ user.email_confirmation = "newtester@osm.org"
+ user.pass_crypt = "testtest"
+ user.pass_crypt_confirmation = "testtest"
+ user
+ end
+
def test_user_create_success
- new_email = "newtester@osm.org"
- display_name = "new_tester"
+ user = new_user
+
assert_difference('User.count') do
assert_difference('ActionMailer::Base.deliveries.size') do
- session[:new_user] = User.new({
- :status => "pending", :display_name => display_name,
- :email => new_email, :email_confirmation => new_email,
- :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
- }, :without_protection => true)
-
- post :save
+ post :save, {}, {:new_user => user}
end
end
-
+
# Check the e-mail
register_email = ActionMailer::Base.deliveries.first
-
- assert_equal register_email.to[0], new_email
+
+ assert_equal register_email.to[0], user.email
assert_match /#{@url}/, register_email.body.to_s
# Check the page
- assert_redirected_to :action => 'login', :referer => nil
-
+ assert_redirected_to :action => 'confirm', :display_name => user.display_name
+
ActionMailer::Base.deliveries.clear
end
-
+
def test_user_create_submit_duplicate_email
- email = users(:public_user).email
- display_name = "new_tester"
- assert_difference('User.count', 0) do
- assert_difference('ActionMailer::Base.deliveries.size', 0) do
- session[:new_user] = User.new({
- :status => "pending", :display_name => display_name,
- :email => email, :email_confirmation => email,
- :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
- }, :without_protection => true)
-
- post :save
+ user = new_user
+ user.email = users(:public_user).email
+
+ assert_no_difference('User.count') do
+ assert_no_difference('ActionMailer::Base.deliveries.size') do
+ post :save, {}, {:new_user => user}
end
end
- assert_response :success
+
+ assert_response :success
assert_template 'new'
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
end
-
+
def test_user_create_submit_duplicate_email_uppercase
- email = users(:public_user).email.upcase
- display_name = "new_tester"
- assert_difference('User.count', 0) do
- assert_difference('ActionMailer::Base.deliveries.size', 0) do
- session[:new_user] = User.new({
- :status => "pending", :display_name => display_name,
- :email => email, :email_confirmation => email,
- :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
- }, :without_protection => true)
-
- post :save
+ user = new_user
+ user.email = users(:public_user).email.upcase
+
+ assert_no_difference('User.count') do
+ assert_no_difference('ActionMailer::Base.deliveries.size') do
+ post :save, {}, {:new_user => user}
end
end
- assert_response :success
+
+ assert_response :success
assert_template 'new'
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
end
def test_user_create_submit_duplicate_name
- email = "new_tester@example.com"
- display_name = users(:public_user).display_name
- assert_difference('User.count', 0) do
- assert_difference('ActionMailer::Base.deliveries.size', 0) do
- session[:new_user] = User.new({
- :status => "pending", :display_name => display_name,
- :email => email, :email_confirmation => email,
- :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
- }, :without_protection => true)
-
- post :save
+ user = new_user
+ user.display_name = users(:public_user).display_name
+
+ assert_no_difference('User.count') do
+ assert_no_difference('ActionMailer::Base.deliveries.size') do
+ post :save, {}, {:new_user => user}
end
end
- assert_response :success
+
+ assert_response :success
assert_template 'new'
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
end
def test_user_create_submit_duplicate_name_uppercase
- email = "new_tester@example.com"
- display_name = users(:public_user).display_name.upcase
- assert_difference('User.count', 0) do
- assert_difference('ActionMailer::Base.deliveries.size', 0) do
- session[:new_user] = User.new({
- :status => "pending", :display_name => display_name,
- :email => email, :email_confirmation => email,
- :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
- }, :without_protection => true)
-
- post :save
+ user = new_user
+ user.display_name = users(:public_user).display_name.upcase
+
+ assert_no_difference('User.count') do
+ assert_no_difference('ActionMailer::Base.deliveries.size') do
+ post :save, {}, {:new_user => user}
end
end
- assert_response :success
+
+ assert_response :success
assert_template 'new'
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
end
+ def test_user_save_referer_params
+ user = new_user
+
+ post :save, {}, {:new_user => user,
+ :referer => '/edit?editor=id#map=1/2/3'}
+
+ assert_equal welcome_path(:editor => 'id', :zoom => 1, :lat => 2, :lon => 3),
+ user.tokens.order("id DESC").first.referer
+ end
+
+ def test_user_confirm_expired_token
+ user = users(:inactive_user)
+ token = user.tokens.new
+ token.expiry = 1.day.ago
+ token.save!
+
+ @request.cookies["_osm_session"] = user.display_name
+ post :confirm, :confirm_string => token.token
+
+ assert_redirected_to :action => 'confirm'
+ assert_match /expired/, flash[:error]
+ end
+
+ def test_user_already_confirmed
+ user = users(:normal_user)
+ token = user.tokens.create
+
+ @request.cookies["_osm_session"] = user.display_name
+ post :confirm, :confirm_string => token.token
+
+ assert_redirected_to :action => 'login'
+ assert_match /confirmed/, flash[:error]
+ end
+
def test_user_terms_new_user
get :terms, {}, { "new_user" => User.new }
assert_response :success
def test_user_terms_seen
user = users(:normal_user)
- # Set the username cookie
- @request.cookies["_osm_username"] = user.display_name
-
get :terms, {}, { "user" => user }
assert_response :redirect
assert_redirected_to :action => :account, :display_name => user.display_name
end
+ def test_user_go_public
+ post :go_public, {}, { :user => users(:normal_user) }
+ assert_response :redirect
+ assert_redirected_to :action => :account, :display_name => users(:normal_user).display_name
+ assert_equal true, User.find(users(:normal_user).id).data_public
+ end
+
def test_user_lost_password
# Test fetching the lost password page
get :lost_password
end
assert_response :success
assert_template :lost_password
- assert_select "div#error", /^Could not find that email address/
+ assert_select ".error", /^Could not find that email address/
# Test resetting using the address as recorded for a user that has an
# address which is case insensitively unique
assert_equal users(:public_user).email, ActionMailer::Base.deliveries.last.to[0]
end
+ def test_reset_password
+ # Test a request with no token
+ get :reset_password
+ assert_response :bad_request
+
+ # Test a request with a bogus token
+ get :reset_password, :token => "made_up_token"
+ assert_response :redirect
+ assert_redirected_to :action => :lost_password
+
+ # Create a valid token for a user
+ token = User.find(users(:inactive_user).id).tokens.create
+
+ # Test a request with a valid token
+ get :reset_password, :token => token.token
+ assert_response :success
+ assert_template :reset_password
+
+ # Test setting a new password
+ post :reset_password, :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" }
+ assert_response :redirect
+ assert_redirected_to :action => :login
+ user = User.find(users(:inactive_user).id)
+ assert_equal "active", user.status
+ assert_equal true, user.email_valid
+ assert_equal user, User.authenticate(:username => "inactive@openstreetmap.org", :password => "new_password")
+ end
+
def test_user_update
# Get a user to work with - note that this user deliberately
# conflicts with uppercase_user in the email and display name
# validation errors being reported
user = users(:normal_user)
- # Set the username cookie
- @request.cookies["_osm_username"] = user.display_name
-
# Make sure that you are redirected to the login page when
# you are not logged in
get :account, { :display_name => user.display_name }
assert_response :redirect
assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account"
- # Make sure that you are redirected to the login page when
- # you are not logged in as the right user
+ # Make sure that you are blocked when not logged in as the right user
get :account, { :display_name => user.display_name }, { "user" => users(:public_user).id }
- assert_response :redirect
- assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account"
+ assert_response :forbidden
# Make sure we get the page when we are logged in as the right user
get :account, { :display_name => user.display_name }, { "user" => user }
assert_response :success
assert_template :account
assert_select "div#errorExplanation", false
- assert_select "div#notice", /^User information updated successfully/
+ 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
# Changing name to one that exists should fail
- user.display_name = users(:public_user).display_name
- post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+ new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name)
+ post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
assert_response :success
assert_template :account
- assert_select "div#notice", false
+ assert_select ".notice", false
assert_select "div#errorExplanation"
assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
# Changing name to one that exists should fail, regardless of case
- user.display_name = users(:public_user).display_name.upcase
- post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+ new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name.upcase)
+ post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
assert_response :success
assert_template :account
- assert_select "div#notice", false
+ assert_select ".notice", false
assert_select "div#errorExplanation"
assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
# Changing name to one that doesn't exist should work
- user.display_name = "new tester"
- post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+ new_attributes = user.attributes.dup.merge(:display_name => "new tester")
+ post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
assert_response :success
assert_template :account
assert_select "div#errorExplanation", false
- assert_select "div#notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", user.display_name
+ assert_select ".notice", /^User information updated successfully/
+ assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", "new tester"
- # Need to update cookies now to stay valid
- @request.cookies["_osm_username"] = user.display_name
+ # Record the change of name
+ user.display_name = "new tester"
# Changing email to one that exists should fail
user.new_email = users(:public_user).email
post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
assert_response :success
assert_template :account
- assert_select "div#notice", false
+ assert_select ".notice", false
assert_select "div#errorExplanation"
assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
assert_response :success
assert_template :account
- assert_select "div#notice", false
+ assert_select ".notice", false
assert_select "div#errorExplanation"
assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
assert_response :success
assert_template :account
assert_select "div#errorExplanation", false
- assert_select "div#notice", /^User information updated successfully/
+ assert_select ".notice", /^User information updated successfully/
assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email
end
get :view, {:display_name => "test"}
assert_response :success
assert_select "div#userinformation" do
- assert_select "a[href=/user/test/edits]", 1
+ assert_select "a[href^=/user/test/history]", 1
assert_select "a[href=/user/test/traces]", 1
assert_select "a[href=/user/test/diary]", 1
assert_select "a[href=/user/test/diary/comments]", 1
get :view, {:display_name => "blocked"}
assert_response :success
assert_select "div#userinformation" do
- assert_select "a[href=/user/blocked/edits]", 1
+ assert_select "a[href^=/user/blocked/history]", 1
assert_select "a[href=/user/blocked/traces]", 1
assert_select "a[href=/user/blocked/diary]", 1
assert_select "a[href=/user/blocked/diary/comments]", 1
get :view, {:display_name => "moderator"}
assert_response :success
assert_select "div#userinformation" do
- assert_select "a[href=/user/moderator/edits]", 1
+ assert_select "a[href^=/user/moderator/history]", 1
assert_select "a[href=/user/moderator/traces]", 1
assert_select "a[href=/user/moderator/diary]", 1
assert_select "a[href=/user/moderator/diary/comments]", 1
# Login as a normal user
session[:user] = users(:normal_user).id
- cookies["_osm_username"] = users(:normal_user).display_name
# Test the normal user
get :view, {:display_name => "test"}
assert_response :success
assert_select "div#userinformation" do
- assert_select "a[href=/user/test/edits]", 1
+ assert_select "a[href^=/user/test/history]", 1
assert_select "a[href=/traces/mine]", 1
assert_select "a[href=/user/test/diary]", 1
assert_select "a[href=/user/test/diary/comments]", 1
# Login as a moderator
session[:user] = users(:moderator_user).id
- cookies["_osm_username"] = users(:moderator_user).display_name
# Test the normal user
get :view, {:display_name => "test"}
assert_response :success
assert_select "div#userinformation" do
- assert_select "a[href=/user/test/edits]", 1
+ assert_select "a[href^=/user/test/history]", 1
assert_select "a[href=/user/test/traces]", 1
assert_select "a[href=/user/test/diary]", 1
assert_select "a[href=/user/test/diary/comments]", 1
get :api_read, :id => users(:normal_user).id
assert_response :success
+ # 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 => 1
+ 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, :id => users(:suspended_user).id
end
def test_user_api_details
+ # 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(users(:normal_user).email, "test")
get :api_details
assert_response :success
+
+ # 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 => 1
+ 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_user_make_friend
# Check that the users aren't already friends
assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
- # Set the username cookie
- @request.cookies["_osm_username"] = user.display_name
-
# When not logged in a GET should ask us to login
get :make_friend, {:display_name => friend.display_name}
assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name)
# Check that the users are friends
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
- # Set the username cookie
- @request.cookies["_osm_username"] = user.display_name
-
# When not logged in a GET should ask us to login
get :remove_friend, {:display_name => friend.display_name}
assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name)
assert_match /is not one of your friends/, flash[:error]
assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
end
+
+ def test_set_status
+ # Try without logging in
+ get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}
+ assert_response :redirect
+ assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended")
+
+ # Now try as a normal user
+ get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id}
+ assert_response :redirect
+ assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+
+ # Finally try as an administrator
+ get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id}
+ assert_response :redirect
+ assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+ assert_equal "suspended", User.find(users(:normal_user).id).status
+ end
+
+ def test_delete
+ # Try without logging in
+ get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}
+ assert_response :redirect
+ assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended")
+
+ # Now try as a normal user
+ get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id}
+ assert_response :redirect
+ assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+
+ # Finally try as an administrator
+ get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id}
+ assert_response :redirect
+ assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+
+ # Check that the user was deleted properly
+ user = User.find(users(:normal_user).id)
+ assert_equal "user_1", user.display_name
+ assert_equal "", user.description
+ assert_nil user.home_lat
+ assert_nil user.home_lon
+ assert_equal false, user.image.file?
+ assert_equal false, user.email_valid
+ assert_nil user.new_email
+ assert_nil user.openid_url
+ assert_equal "deleted", user.status
+ end
end
projects / rails.git / blobdiff