X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b825f4826ac1ce3382d168186d0e83ad2eeb0929..39a54f8c14d739c95495e0d2c0ca56826eddfe52:/test/functional/user_controller_test.rb diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index cb40659a7..cba27f852 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -315,7 +315,7 @@ class UserControllerTest < ActionController::TestCase :referer => '/edit?editor=id#map=1/2/3'} assert_equal welcome_path(:editor => 'id', :zoom => 1, :lat => 2, :lon => 3), - user.tokens.first.referer + user.tokens.order("id DESC").first.referer end def test_user_confirm_expired_token @@ -359,6 +359,15 @@ class UserControllerTest < ActionController::TestCase assert_redirected_to :action => :account, :display_name => user.display_name end + def test_user_go_public + @request.cookies["_osm_username"] = users(:normal_user).display_name + + 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 @@ -416,6 +425,34 @@ class UserControllerTest < ActionController::TestCase 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 @@ -601,10 +638,33 @@ class UserControllerTest < ActionController::TestCase 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 @@ -620,12 +680,50 @@ class UserControllerTest < ActionController::TestCase 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 @@ -733,4 +831,59 @@ class UserControllerTest < ActionController::TestCase 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") + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # 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 + + @request.cookies["_osm_username"] = users(:administrator_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") + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # 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 + + @request.cookies["_osm_username"] = users(:administrator_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