X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/56fd5c4d90c7d3757fb97ff16c40aaa307ae1d22..b0fa1cf936fffb2251bd47db57663ba5e03a23b8:/test/functional/user_controller_test.rb

diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb
index fce4470e3..12668ff0c 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
@@ -794,4 +831,26 @@ 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
 end