Make the UsersController more RESTful by moving actions that act on the Users resource from LoginController to UsersController.

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@410 a4c988fc-2ded-0310-b66e-134b36920a42

tracks/test/functional/login_controller_test.rb

@@ -75,79 +75,15 @@ class LoginControllerTest < Test::Unit::TestCase
     assert_equal "Login unsuccessful", flash[:warning]
     assert_response :success
   end
-    
-  # ============================================
-  # Signup and creation of new users
-  # ============================================
-  
-  # Test signup of a new user by admin
-  # Check that newly created user can log in
-  #
-  def test_create
-    admin = login('admin', 'abracadabra', 'on')
-    assert admin.is_admin
-    newbie = create('newbie', 'newbiepass')
-    assert_equal "Signup successful for user newbie.", flash[:notice]
-    assert_redirected_to home_url
-    assert_valid newbie
-    get :logout # logout the admin user
-    assert_equal newbie.login, "newbie"
-    assert newbie.is_admin == false || newbie.is_admin == 0
-    assert_not_nil newbie.preference # have user preferences been created?
-    user = login('newbie', 'newbiepass', 'on') # log in the new user
-    assert_redirected_to home_url
-    assert_equal 'newbie', user.login
-    assert user.is_admin == false || user.is_admin == 0
-    assert_equal User.count, @num_users_in_fixture + 1
-  end
-  
-  # Test whether signup of new users is denied to a non-admin user
-  # 
-  def test_create_by_non_admin
-    non_admin = login('jane', 'sesame', 'on')
-    assert non_admin.is_admin == false || non_admin.is_admin == 0
-    post :signup, :user => {:login => 'newbie2', :password => 'newbiepass2', :password_confirmation => 'newbiepass2'}
-    assert_template 'login/nosignup'
-    assert_number_of_users_is_unchanged
-  end
-  
-  # ============================================
-  # Test validations
-  # ============================================
-  
-  def test_create_with_invalid_password
-    admin = login('admin', 'abracadabra', 'on')
-    assert admin.is_admin
-    assert_equal admin.id, @response.session['user_id']
-    post :create, :user => {:login => 'newbie', :password => '', :password_confirmation => ''}
-    assert_number_of_users_is_unchanged
-    assert_redirected_to :controller => 'login', :action => 'signup'    
-  end
-  
-  def test_create_with_invalid_user
-    admin = login('admin', 'abracadabra', 'on')
-    assert admin.is_admin
-    assert_equal admin.id, @response.session['user_id']
-    post :create, :user => {:login => 'n', :password => 'newbiepass', :password_confirmation => 'newbiepass'}
-    assert_number_of_users_is_unchanged
-    assert_redirected_to :controller => 'login', :action => 'signup'    
-  end
-  
-  # Test uniqueness of login
-  #
-  def test_validate_uniqueness_of_login
-    admin = login('admin', 'abracadabra', 'on')
-    assert admin.is_admin
-    assert_equal admin.id, @response.session['user_id']
-    post :create, :user => {:login => 'jane', :password => 'newbiepass', :password_confirmation => 'newbiepass'}
-    num_users = User.find(:all)
-    assert_number_of_users_is_unchanged
-    assert_redirected_to :controller => 'login', :action => 'signup'
-  end
   
   private
   
-  def assert_number_of_users_is_unchanged
-    assert_equal User.count, @num_users_in_fixture    
+  # Logs in a user and returns the user object found in the session object
+  def login(login,password,expiry)
+    post :login, {:user_login => login, :user_password => password, :user_noexpiry => expiry}
+    assert_not_nil(session['user_id'])
+    return User.find(session['user_id'])
   end
+  
+    
 end

tracks/test/functional/users_controller_test.rb

@@ -6,7 +6,7 @@ require 'user'
 class UsersController; def rescue_action(e) raise e end; end
 
 class UsersControllerTest < Test::Unit::TestCase
-  fixtures :users
+  fixtures :preferences, :users
   
   def setup
     assert_equal "test", ENV['RAILS_ENV']
@@ -14,6 +14,9 @@ class UsersControllerTest < Test::Unit::TestCase
     @controller = UsersController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    @num_users_in_fixture = User.count
+    @admin_user = users(:admin_user)
+    @nonadmin_user = users(:other_user)
   end
   
   def test_get_index_when_not_logged_in
@@ -22,20 +25,20 @@ class UsersControllerTest < Test::Unit::TestCase
   end
   
   def test_get_index_by_nonadmin
-    @request.session['user_id'] = users(:other_user).id
+    login_as @nonadmin_user
     get :index
-    assert_redirected_to home_path
+    assert_response 401
   end
   
   def test_get_index_by_admin
-    @request.session['user_id'] = users(:admin_user).id
+    login_as @admin_user
     get :index
     assert_response :success
   end
   
   def test_destroy_user
+    login_as @admin_user
     @no_users_before = User.find(:all).size
-    @request.session['user_id'] = users(:admin_user).id
     xhr :post, :destroy, :id => 3
     assert_rjs :page, "user-3", :remove
     assert_equal @no_users_before-1, User.find(:all).size
@@ -44,7 +47,7 @@ class UsersControllerTest < Test::Unit::TestCase
   def test_update_password_successful
     get :change_password # should fail because no login
     assert_redirected_to :controller => 'login', :action => 'login'
-    @request.session['user_id'] = users(:admin_user).id # log in the admin user
+    login_as @admin_user
     @user = @request.session['user_id']
     get :change_password # should now pass because we're logged in
     assert_response :success
@@ -59,7 +62,7 @@ class UsersControllerTest < Test::Unit::TestCase
   def test_update_password_no_confirmation
     post :update_password # should fail because no login
     assert_redirected_to :controller => 'login', :action => 'login'
-    @request.session['user_id'] = users(:admin_user).id # log in the admin user
+    login_as @admin_user
     post :update_password, :updateuser => {:password => 'newpassword', :password_confirmation => 'wrong'}
     assert_redirected_to :controller => 'users', :action => 'change_password'
     assert users(:admin_user).save, false
@@ -69,7 +72,7 @@ class UsersControllerTest < Test::Unit::TestCase
   def test_update_password_validation_errors
     post :update_password # should fail because no login
     assert_redirected_to :controller => 'login', :action => 'login'
-    @request.session['user_id'] = users(:admin_user).id # log in the admin user
+    login_as @admin_user
     post :update_password, :updateuser => {:password => 'ba', :password_confirmation => 'ba'}
     assert_redirected_to :controller => 'users', :action => 'change_password'
     assert users(:admin_user).save, false
@@ -79,4 +82,79 @@ class UsersControllerTest < Test::Unit::TestCase
     assert_equal flash[:warning], 'There was a problem saving the password. Please retry.'
   end
   
+  # ============================================
+  # Signup and creation of new users
+  # ============================================
+  
+  def test_create
+    login_as @admin_user
+    newbie = create('newbie', 'newbiepass')
+    assert_equal "Signup successful for user newbie.", flash[:notice], "expected flash notice not found"
+    assert_redirected_to home_url
+    assert_valid newbie
+    session['user_id'] = nil # logout the admin user
+    assert_equal newbie.login, "newbie"
+    assert newbie.is_admin == false || newbie.is_admin == 0
+    assert_not_nil newbie.preference # have user preferences been created?
+    assert_not_nil User.authenticate('newbie', 'newbiepass')
+    assert_equal User.count, @num_users_in_fixture + 1
+  end
+  
+  # Test whether signup of new users is denied to a non-admin user
+  # 
+  def test_create_by_non_admin
+    non_admin = login_as @nonadmin_user
+    post :create, :user => {:login => 'newbie2', :password => 'newbiepass2', :password_confirmation => 'newbiepass2'}
+    assert_response :success
+    assert_template 'users/nosignup'
+    assert_number_of_users_is_unchanged
+  end
+  
+  # ============================================
+  # Test validations
+  # ============================================
+  
+  def test_create_with_invalid_password
+    login_as @admin_user
+    post :create, :user => {:login => 'newbie', :password => '', :password_confirmation => ''}
+    assert_number_of_users_is_unchanged
+    assert_redirected_to :controller => 'users', :action => 'new'    
+  end
+  
+  def test_create_with_invalid_user
+    login_as @admin_user
+    post :create, :user => {:login => 'n', :password => 'newbiepass', :password_confirmation => 'newbiepass'}
+    assert_number_of_users_is_unchanged
+    assert_redirected_to :controller => 'users', :action => 'new'    
+  end
+  
+  # Test uniqueness of login
+  #
+  def test_validate_uniqueness_of_login
+    login_as @admin_user
+    post :create, :user => {:login => 'jane', :password => 'newbiepass', :password_confirmation => 'newbiepass'}
+    num_users = User.find(:all)
+    assert_number_of_users_is_unchanged
+    assert_redirected_to :controller => 'users', :action => 'new'    
+  end
+  
+  private
+  
+  def login_as(user)
+    returning user do |u|
+      @request.session['user_id'] = u.id
+    end
+  end
+  
+  # Creates a new users with the login and password given
+  def create(login,password)
+    post :create, :user => {:login => login, :password => password, :password_confirmation => password}
+    return User.find_by_login(login)
+  end
+  
+  def assert_number_of_users_is_unchanged
+    assert_equal User.count, @num_users_in_fixture    
+  end
+  
+  
 end

tracks/test/integration/stories_test.rb

@@ -49,17 +49,17 @@ class StoriesTest < ActionController::IntegrationTest
       def goes_to_signup
         get "/signup"
         assert_response :success
-        assert_template "login/signup"
+        assert_template "users/new"
       end
       
       def goes_to_signup_as_nonadmin
         get "/signup"
         assert_response :success
-        assert_template "login/nosignup"
+        assert_template "users/nosignup"
       end
 
       def signs_up_with(options)
-        post "/login/create", options
+        post "/users", options
         assert_response :redirect
         follow_redirect!
         assert_response :success

tracks/test/test_helper.rb

@@ -16,22 +16,6 @@ class Test::Unit::TestCase
   
   # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
   self.use_instantiated_fixtures  = false
-
-  # Add more helper methods to be used by all tests here...
-  # Logs in a user and returns the user object found in the session object
-  #
-  def login(login,password,expiry)
-    post :login, {:user_login => login, :user_password => password, :user_noexpiry => expiry}
-    assert_not_nil(session['user_id'])
-    return User.find(session['user_id'])
-  end
-  
-  # Creates a new users with the login and password given
-  def create(login,password)
-    post :create, :user => {:login => login, :password => password, :password_confirmation => password}
-    return User.find_by_login(login)
-  end
-  
     
   # Generates a random string of ascii characters (a-z, "1 0")
   # of a given length for testing assignment to fields