app/controllers/sessions_controller.rb app/controllers/users_controller.rb app/helpers/sessions_helper.rb app/helpers/users_helper.rb app/views/sessions/new.html.erb app/views/users/new.html.erb test/functional/sessions_controller_test.rb test/functional/users_controller_test.rb vendor/plugins/restful_authentication/README vendor/plugins/restful_authentication/Rakefile vendor/plugins/restful_authentication/generators/authenticated/USAGE vendor/plugins/restful_authentication/generators/authenticated/authenticated_generator.rb vendor/plugins/restful_authentication/generators/authenticated/templates/activation.html.erb vendor/plugins/restful_authentication/generators/authenticated/templates/authenticated_system.rb vendor/plugins/restful_authentication/generators/authenticated/templates/authenticated_test_helper.rb vendor/plugins/restful_authentication/generators/authenticated/templates/controller.rb vendor/plugins/restful_authentication/generators/authenticated/templates/fixtures.yml vendor/plugins/restful_authentication/generators/authenticated/templates/functional_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/functional_test.rb vendor/plugins/restful_authentication/generators/authenticated/templates/helper.rb vendor/plugins/restful_authentication/generators/authenticated/templates/login.html.erb vendor/plugins/restful_authentication/generators/authenticated/templates/mailer.rb vendor/plugins/restful_authentication/generators/authenticated/templates/mailer_test.rb vendor/plugins/restful_authentication/generators/authenticated/templates/migration.rb vendor/plugins/restful_authentication/generators/authenticated/templates/model.rb vendor/plugins/restful_authentication/generators/authenticated/templates/model_controller.rb vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_test.rb vendor/plugins/restful_authentication/generators/authenticated/templates/model_helper.rb vendor/plugins/restful_authentication/generators/authenticated/templates/observer.rb vendor/plugins/restful_authentication/generators/authenticated/templates/signup.html.erb vendor/plugins/restful_authentication/generators/authenticated/templates/signup_notification.html.erb vendor/plugins/restful_authentication/generators/authenticated/templates/unit_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/unit_test.rb vendor/plugins/restful_authentication/install.rb vendor/plugins/restful_authentication/lib/restful_authentication/rails_commands.rb @@ -1,4 +1,8 @@ ActionController::Routing::Routes.draw do |map| + + map.resources :users + map.resource :session + # The priority is based upon order of creation: first created -> highest priority. # Sample of regular route: config/routes.rb @@ -5,19 +5,20 @@ module AuthenticatedSystem def logged_in? current_user != :false end - - # Accesses the current user from the session. + + # Accesses the current user from the session. Set it to :false if login fails + # so that future calls do not hit the database. def current_user - @current_user ||= (session[:user] && User.find_by_id(session[:user])) || :false + @current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie || :false) end - - # Store the given user in the session. + + # Store the given user id in the session. def current_user=(new_user) - session[:user] = (new_user.nil? || new_user.is_a?(Symbol)) ? nil : new_user.id - @current_user = new_user + session[:user_id] = (new_user.nil? || new_user.is_a?(Symbol)) ? nil : new_user.id + @current_user = new_user || :false end - - # Check if the user is authorized. + + # Check if the user is authorized # # Override this method in your controllers if you want to restrict access # to only a few actions or if you want to check if the user @@ -26,11 +27,11 @@ module AuthenticatedSystem # Example: # # # only allow nonbobs - # def authorize? + # def authorized? # current_user.login != "bob" # end def authorized? - true + logged_in? end # Filter method to enforce a login requirement. @@ -48,11 +49,9 @@ module AuthenticatedSystem # skip_before_filter :login_required # def login_required - username, passwd = get_auth_data - self.current_user ||= User.authenticate(username, passwd) || :false if username && passwd - logged_in? && authorized? ? true : access_denied + authorized? || access_denied end - + # Redirect as appropriate when an access request fails. # # The default action is to redirect to the login screen. @@ -62,59 +61,56 @@ module AuthenticatedSystem # to access the requested action. For example, a popup window might # simply close itself. def access_denied - respond_to do |accepts| - accepts.html do + respond_to do |format| + format.html do store_location - redirect_to :controller => '/account', :action => 'login' + redirect_to :controller => '/session', :action => 'new' + end + format.xml do + request_http_basic_authentication 'Web Password' end - # accepts.xml do - # headers["Status"] = "Unauthorized" - # headers["WWW-Authenticate"] = %(Basic realm="Web Password") - # render :text => "Could't authenticate you", :status => '401 Unauthorized' - # end end - false - end - + end + # Store the URI of the current request in the session. # # We can return to this location by calling #redirect_back_or_default. def store_location session[:return_to] = request.request_uri end - + # Redirect to the URI stored by the most recent store_location call or # to the passed default. def redirect_back_or_default(default) - session[:return_to] ? redirect_to_url(session[:return_to]) : redirect_to(default) + redirect_to(session[:return_to] || default) session[:return_to] = nil end - + # Inclusion hook to make #current_user and #logged_in? # available as ActionView helper methods. def self.included(base) base.send :helper_method, :current_user, :logged_in? end - # When called with before_filter :login_from_cookie will check for an :auth_token - # cookie and log the user back in if apropriate + # Called from #current_user. First attempt to login by the user id stored in the session. + def login_from_session + self.current_user = User.find(session[:user_id]) if session[:user_id] + end + + # Called from #current_user. Now, attempt to login by basic authentication information. + def login_from_basic_auth + authenticate_with_http_basic do |username, password| + self.current_user = User.authenticate(username, password) + end + end + + # Called from #current_user. Finaly, attempt to login by an expiring token in the cookie. def login_from_cookie - return unless cookies[:auth_token] && !logged_in? - user = User.find_by_remember_token(cookies[:auth_token]) + user = cookies[:auth_token] && User.find_by_remember_token(cookies[:auth_token]) if user && user.remember_token? user.remember_me + cookies[:auth_token] = { :value => user.remember_token, :expires => user.remember_token_expires_at } self.current_user = user - cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at } - flash[:notice] = "Logged in successfully" end end - - private - @@http_auth_headers = %w(X-HTTP_AUTHORIZATION HTTP_AUTHORIZATION Authorization) - # gets BASIC auth info - def get_auth_data - auth_key = @@http_auth_headers.detect { |h| request.env.has_key?(h) } - auth_data = request.env[auth_key].to_s.split unless auth_key.blank? - return auth_data && auth_data[0] == 'Basic' ? Base64.decode64(auth_data[1]).split(':')[0..1] : [nil, nil] - end end lib/authenticated_system.rb @@ -1,116 +1,10 @@ module AuthenticatedTestHelper # Sets the current user in the session from the user fixtures. def login_as(user) - @request.session[:user] = user ? users(user).id : nil + @request.session[:user_id] = user ? users(user).id : nil end - # def content_type(type) - # @request.env['Content-Type'] = type - # end - # - # def accept(accept) - # @request.env["HTTP_ACCEPT"] = accept - # end - # - # def authorize_as(user) - # if user - # @request.env["HTTP_AUTHORIZATION"] = "Basic #{Base64.encode64("#{users(user).login}:test")}" - # accept 'application/xml' - # content_type 'application/xml' - # else - # @request.env["HTTP_AUTHORIZATION"] = nil - # accept nil - # content_type nil - # end - # end - - # http://project.ioni.st/post/217#post-217 - # - # def test_new_publication - # assert_difference(Publication, :count) do - # post :create, :publication => {...} - # # ... - # end - # end - # - def assert_difference(object, method = nil, difference = 1) - initial_value = object.send(method) - yield - assert_equal initial_value + difference, object.send(method), "#{object}##{method}" - end - - def assert_no_difference(object, method, &block) - assert_difference object, method, 0, &block + def authorize_as(user) + @request.env["HTTP_AUTHORIZATION"] = user ? ActionController::HttpAuthentication::Basic.encode_credentials(users(user).login, 'test') : nil end end - -# I don't use these because I just show error pages with a status of 200 when unauthorized. - -# # Assert the block redirects to the login -# # -# # assert_requires_login(:bob) { |c| c.get :edit, :id => 1 } -# # -# def assert_requires_login(login = nil) -# yield HttpLoginProxy.new(self, login) -# end -# -# # def assert_http_authentication_required(login = nil) -# # yield XmlLoginProxy.new(self, login) -# # end -# # -# def reset!(*instance_vars) -# instance_vars = [:controller, :request, :response] unless instance_vars.any? -# instance_vars.collect! { |v| "@#{v}".to_sym } -# instance_vars.each do |var| -# instance_variable_set(var, instance_variable_get(var).class.new) -# end -# end -# end -# -# class BaseLoginProxy -# attr_reader :controller -# attr_reader :options -# def initialize(controller, login) -# @controller = controller -# @login = login -# end -# -# private -# def authenticated -# raise NotImplementedError -# end -# -# def check -# raise NotImplementedError -# end -# -# def method_missing(method, *args) -# @controller.reset! -# authenticate -# @controller.send(method, *args) -# check -# end -# end -# -# class HttpLoginProxy < BaseLoginProxy -# protected -# def authenticate -# @controller.login_as @login if @login -# end -# -# def check -# @controller.assert_redirected_to :controller => :account, :action => :login -# end -# end -# -# class XmlLoginProxy < BaseLoginProxy -# protected -# def authenticate -# @controller.accept 'application/xml' -# @controller.authorize_as @login if @login -# end -# -# def check -# @controller.assert_response 401 -# end -# end \ No newline at end of file lib/authenticated_test_helper.rb @@ -1,35 +1,18 @@ -# == Schema Information -# Schema version: 9 -# -# Table name: users -# -# id :integer not null, primary key -# login :string(255) not null -# name :string(64) not null -# email :string(255) not null -# crypted_password :string(40) not null -# salt :string(40) not null -# created_at :datetime not null -# updated_at :datetime -# remember_token :string(255) -# remember_token_expires_at :datetime -# - -dustin: +quentin: id: 1 - login: dustin - name: Dustin Sallings - email: dustin@spy.net - salt: 8a27848feb984eed127689e6b53412302b776def - crypted_password: b69064ecd9f2d3412b4604f430b4ebcec269516a # test + name: Quentin + login: quentin + email: quentin@example.com + salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd + crypted_password: 00742970dc9e6319f8019fd54864d3ea740f04b1 # test created_at: <%= 5.days.ago.to_s :db %> - # activated_at: <%= 5.days.ago.to_s :db %> # only if you're activating new signups + aaron: id: 2 + name: Aaron login: aaron - name: Aaron Something email: aaron@example.com salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd crypted_password: 00742970dc9e6319f8019fd54864d3ea740f04b1 # test - # activation_code: aaronscode # only if you're activating new signups created_at: <%= 1.days.ago.to_s :db %> + test/fixtures/users.yml @@ -18,19 +18,19 @@ class AcctControllerTest < Test::Unit::TestCase def test_unauthenticated_index get :index - assert_redirected_to :controller => :account, :action => :login + assert_redirected_to :controller => :session, :action => :new end def test_index - login_as :dustin + login_as :quentin get :index assert_response :success - assert_equal users(:dustin).groups, assigns['groups'] + assert_equal users(:quentin).groups, assigns['groups'] end # This test just validates the response is successful. def test_cat_list - login_as :dustin + login_as :quentin get :cats_for_acct, {:id => 1} assert_response :success assert @response.body.include?('Cat1') test/functional/acct_controller_test.rb @@ -16,21 +16,21 @@ class AdmControllerTest < Test::Unit::TestCase end def test_recent - login_as :dustin + login_as :quentin get :recent assert_response :success assert_equal 4, assigns['transactions'].length end def test_users - login_as :dustin + login_as :quentin get :users assert_response :success assert_equal [1, 2], assigns['users'].map(&:id).sort end def test_reset_password_form - login_as :dustin + login_as :quentin get :reset_password assert_response :success assert_template 'reset_password_form' @@ -38,7 +38,7 @@ class AdmControllerTest < Test::Unit::TestCase def test_reset_password assert User.authenticate('aaron', 'test') - login_as :dustin + login_as :quentin post :reset_password, :user => 'aaron' assert_response :success assert_template "reset_password" @@ -50,30 +50,30 @@ class AdmControllerTest < Test::Unit::TestCase def test_reset_not_admin login_as :aaron - post :reset_password, :user => 'dustin' + post :reset_password, :user => 'quentin' assert_response :success assert_template 'report/access_denied' - assert User.authenticate('dustin', 'blahblah'), 'Password changed!' + assert User.authenticate('quentin', 'test'), 'Password changed!' end def test_rjs_delete - login_as :dustin - assert_difference MoneyTransaction, :count, -1 do + login_as :quentin + assert_difference 'MoneyTransaction.count', -1 do xhr :post, :delete, :id => 1 end assert_response :success end def test_rjs_undelete - login_as :dustin - assert_difference MoneyTransaction, :count do + login_as :quentin + assert_difference 'MoneyTransaction.count' do xhr :post, :undelete, :id => 3 end assert_response :success end def test_new_user_form - login_as :dustin + login_as :quentin get :new_user assert_response :success assert_template 'adm/new_user' @@ -82,8 +82,8 @@ class AdmControllerTest < Test::Unit::TestCase end def test_new_user - login_as :dustin - assert_difference User, :count do + login_as :quentin + assert_difference 'User.count' do post :new_user, :user => {:login => 'dtest', :name => 'D Test', :email => 'dtest@spy.net'}, :group => {1 => 1, 2 => 1} end @@ -97,7 +97,7 @@ class AdmControllerTest < Test::Unit::TestCase end def test_set_groups_form - login_as :dustin + login_as :quentin get :set_groups assert_response :success assert_template 'adm/set_groups' @@ -106,7 +106,7 @@ class AdmControllerTest < Test::Unit::TestCase end def test_set_groups - login_as :dustin + login_as :quentin assert_equal [1], User.find_by_login('aaron').groups.map(&:id).sort post :set_groups, :user => 'aaron', :group => { 1 => 0, 2 => 1 } assert_equal [2], User.find_by_login('aaron').groups.map(&:id).sort @@ -118,7 +118,7 @@ class AdmControllerTest < Test::Unit::TestCase end def test_set_groups_empty - login_as :dustin + login_as :quentin assert_equal [1], User.find_by_login('aaron').groups.map(&:id).sort post :set_groups, :user => 'aaron' assert_equal [], User.find_by_login('aaron').groups.map(&:id).sort @@ -130,7 +130,7 @@ class AdmControllerTest < Test::Unit::TestCase end def test_set_groups_invalid_user - login_as :dustin + login_as :quentin post :set_groups, :user => 'nobody', :group => { 2 => 1 } assert_response :success assert_template 'adm/set_groups' test/functional/adm_controller_test.rb @@ -26,20 +26,20 @@ class AllowanceControllerTest < Test::Unit::TestCase def test_complete login_as :aaron - assert_difference MoneyTransaction, :count, 4 do + assert_difference 'MoneyTransaction.count', 4 do post :complete, :task => {"1" => "on", "3" => "on"} end end def test_redoing_unavailable login_as :aaron - assert_difference MoneyTransaction, :count, 0 do + assert_difference 'MoneyTransaction.count', 0 do post :complete, :task => {"2" => "on"} end end def test_created - login_as :dustin + login_as :quentin get :created assert_response :success assert_equal [2, 1, 4, 3], assigns['tasks'][users(:aaron)].map(&:id) @@ -48,10 +48,10 @@ class AllowanceControllerTest < Test::Unit::TestCase end def test_new_form - login_as :dustin + login_as :quentin get :new assert_response :success - assert !assigns['users'].map(&:id).include?(users(:dustin).id) + assert !assigns['users'].map(&:id).include?(users(:quentin).id) assert_equal [1,2], assigns['categories'].keys assert_equal [1,2], assigns['accounts'].keys @@ -73,8 +73,8 @@ class AllowanceControllerTest < Test::Unit::TestCase end def test_new - login_as :dustin - assert_difference AllowanceTask, :count do + login_as :quentin + assert_difference 'AllowanceTask.count' do post :new, :allowance_task => { :name => 'Test Task', :description => 'A test task.', :owner_id => 2, :frequency => 2, :value => 1.29, @@ -86,8 +86,8 @@ class AllowanceControllerTest < Test::Unit::TestCase end def test_deactivation - login_as :dustin - assert_difference AllowanceTask, :count_active, -1 do + login_as :quentin + assert_difference 'AllowanceTask.count_active', -1 do xhr :post, :task_toggle, :id => 1, :active => 'false' assert_response :success assert_template 'allowance/deactivate' @@ -95,8 +95,8 @@ class AllowanceControllerTest < Test::Unit::TestCase end def test_activation - login_as :dustin - assert_difference AllowanceTask, :count_active do + login_as :quentin + assert_difference 'AllowanceTask.count_active' do xhr :post, :task_toggle, :id => 4, :active => 'true' assert_response :success assert_template 'allowance/activate' test/functional/allowance_controller_test.rb @@ -17,39 +17,39 @@ class ReportControllerTest < Test::Unit::TestCase end def test_index - login_as :dustin + login_as :quentin get :index assert_response :success end def test_balances - login_as :dustin + login_as :quentin get :balances assert_response :success end def test_flow_month - login_as :dustin + login_as :quentin get :month_flow assert_response :success assert assigns['flow'] end def test_flow_year - login_as :dustin + login_as :quentin get :year_flow assert_response :success assert assigns['flow'] end def test_month_cat_form - login_as :dustin + login_as :quentin get :month_cat_form assert_equal Date.today, assigns['today'] end def test_month_cat - login_as :dustin + login_as :quentin get :month_cat, :year => 2007, :month => 11 assert_response :success assert assigns['cats'] @@ -58,7 +58,7 @@ class ReportControllerTest < Test::Unit::TestCase end def test_month_cat_by_date - login_as :dustin + login_as :quentin get :month_cat, :date => '2007-11-01' assert_response :success assert assigns['cats'] @@ -67,7 +67,7 @@ class ReportControllerTest < Test::Unit::TestCase end def test_month_cat_txns - login_as :dustin + login_as :quentin get :month_cat_txns, :date => '2007-11-01', :cat => 1 assert_response :success assert assigns['transactions'] test/functional/report_controller_test.rb @@ -23,7 +23,7 @@ class TxnControllerTest < Test::Unit::TestCase end def test_transactions_all - login_as :dustin + login_as :quentin get :all, {:id => 1} assert_response :success assert_equal 3, assigns['transactions'].length @@ -33,7 +33,7 @@ class TxnControllerTest < Test::Unit::TestCase end def test_index - login_as :dustin + login_as :quentin get :index, {:id => 1} assert_response :success assert_equal 2, assigns['transactions'].length @@ -43,7 +43,7 @@ class TxnControllerTest < Test::Unit::TestCase end def test_transactions2 - login_as :dustin + login_as :quentin get :index, {:id => 2} assert_response :success assert_equal 1, assigns['transactions'].length @@ -53,7 +53,7 @@ class TxnControllerTest < Test::Unit::TestCase end def test_transactions3 - login_as :dustin + login_as :quentin get :index, {:id => 3} assert_response :success assert_equal 0, assigns['transactions'].length @@ -63,14 +63,14 @@ class TxnControllerTest < Test::Unit::TestCase end def test_unreconciled - login_as :dustin + login_as :quentin get :unreconciled, {:id => 1} assert_response :success assert_equal 1, assigns['transactions'].length end def test_new_form - login_as :dustin + login_as :quentin get :new, {:id => 1} assert_response :success assert assigns['today'] @@ -104,7 +104,7 @@ class TxnControllerTest < Test::Unit::TestCase def test_cross_group_transfer_through_helper oldbal=groups(:one).balance - txn1, txn2=do_transfer(users(:dustin), money_accounts(:one), money_accounts(:three), + txn1, txn2=do_transfer(users(:quentin), money_accounts(:one), money_accounts(:three), categories(:one), categories(:three), '2007-11-01', 3.11, 'Transfer test') assert_in_delta -3.11, txn1.amount, 2 ** -20 @@ -136,7 +136,7 @@ class TxnControllerTest < Test::Unit::TestCase end def test_transfer_form - login_as :dustin + login_as :quentin get :transfer, {:id => 1} assert_response :success assert assigns['today'] @@ -145,14 +145,14 @@ class TxnControllerTest < Test::Unit::TestCase end def test_transfer_bad_accounts - login_as :dustin + login_as :quentin post :transfer, {:id => 1, :dest_acct => 1} assert_response 302 assert flash[:error] end def test_transfer - login_as :dustin + login_as :quentin post :transfer, {:id => 1, :dest_acct => 2, :dest_cat => 1, :src => {:category_id => 1}, :details => {:ds => '2007-11-25', :amount => 1.33, :descr => 'test'}} @@ -161,7 +161,7 @@ class TxnControllerTest < Test::Unit::TestCase end def test_transfer_across_groups - login_as :dustin + login_as :quentin post :transfer, {:id => 1, :dest_acct => 3, :dest_cat => 3, :src => {:category_id => 1}, :details => {:ds => '2007-11-25', :amount => 1.33, :descr => 'test'}} @@ -170,14 +170,14 @@ class TxnControllerTest < Test::Unit::TestCase end def test_descr_update - login_as :dustin + login_as :quentin xhr :put, :update, :id => 1, :f => 'descr', :value => 'Changed Stuff' assert_response :success assert_equal 'Changed Stuff', MoneyTransaction.find(1).descr end def test_unhandled_field - login_as :dustin + login_as :quentin begin xhr :put, :update, :id => 1, :f => 'somecrap', :value => 'Changed Stuff' rescue RuntimeError => e @@ -186,38 +186,38 @@ class TxnControllerTest < Test::Unit::TestCase end def test_cat_update - login_as :dustin + login_as :quentin xhr :put, :update, :id => 1, :f => 'cat', :value => 'Cat2' assert_response :success assert_equal Category.find_by_name('Cat2'), MoneyTransaction.find(1).category end def test_rjs_reconcile - login_as :dustin - assert_difference MoneyTransaction, :count_reconciled do + login_as :quentin + assert_difference 'MoneyTransaction.count_reconciled' do xhr :put, :update, :id => 1, :f => 'reconciled', :value => 1 end assert_response :success end def test_rjs_reconcile_four - login_as :dustin - assert_difference MoneyTransaction, :count_reconciled do + login_as :quentin + assert_difference 'MoneyTransaction.count_reconciled' do xhr :put, :update, :id => 4, :f => 'reconciled', :value => 1 end assert_response :success end def test_rjs_unreconcile - login_as :dustin - assert_difference MoneyTransaction, :count_reconciled, -1 do + login_as :quentin + assert_difference 'MoneyTransaction.count_reconciled', -1 do xhr :put, :update, :id => 2, :f => 'reconciled', :value => 0 end assert_response :success end def test_current_reconciled - login_as :dustin + login_as :quentin xhr :get, :current_reconciled, :id => 2 assert_equal 2, assigns(:current_acct).id end @@ -225,7 +225,7 @@ class TxnControllerTest < Test::Unit::TestCase private def new_test(offset_expectation, args) - login_as :dustin + login_as :quentin acct = MoneyAccount.find 1 old_balance = acct.balance post :create, args test/functional/txn_controller_test.rb @@ -9,7 +9,7 @@ class AllowanceTaskTest < Test::Unit::TestCase t=AllowanceTask.find :first, :order => ['id'] assert_equal "Do Stuff", t.name assert_equal "Do all the stuff.", t.description - assert_equal users(:dustin), t.creator + assert_equal users(:quentin), t.creator assert_equal users(:aaron), t.owner assert_equal 7, t.frequency assert_in_delta 0.25, t.value, 2 ** -20 @@ -48,7 +48,7 @@ class AllowanceTaskTest < Test::Unit::TestCase t=AllowanceTask.new t.name = 'Test' t.description = 'test' - t.creator = users(:dustin) + t.creator = users(:quentin) t.owner = users(:aaron) t.frequency = 3 t.value = 3.99 @@ -63,7 +63,7 @@ class AllowanceTaskTest < Test::Unit::TestCase t=AllowanceTask.new t.name = 'Test' t.description = 'test' - t.creator = users(:dustin) + t.creator = users(:quentin) t.owner = users(:aaron) t.frequency = 3 t.value = -3.99 @@ -79,7 +79,7 @@ class AllowanceTaskTest < Test::Unit::TestCase t=AllowanceTask.new t.name = 'Test' t.description = 'test' - t.creator = users(:dustin) + t.creator = users(:quentin) t.owner = users(:aaron) t.frequency = 0 t.value = 3.99 @@ -96,7 +96,7 @@ class AllowanceTaskTest < Test::Unit::TestCase t.name = 'Test' t.description = 'test' t.creator = users(:aaron) - t.owner = users(:dustin) + t.owner = users(:quentin) t.frequency = 3 t.value = 3.99 t.from_account = money_accounts(:three) @@ -111,7 +111,7 @@ class AllowanceTaskTest < Test::Unit::TestCase t=AllowanceTask.new t.name = 'Test' t.description = 'test' - t.creator = users(:dustin) + t.creator = users(:quentin) t.owner = users(:aaron) t.frequency = 3 t.value = 3.99 @@ -127,7 +127,7 @@ class AllowanceTaskTest < Test::Unit::TestCase t=AllowanceTask.new t.name = 'Test' t.description = 'test' - t.creator = users(:dustin) + t.creator = users(:quentin) t.owner = users(:aaron) t.frequency = 3 t.value = 3.99 @@ -141,7 +141,7 @@ class AllowanceTaskTest < Test::Unit::TestCase # Perform a task, make sure money gets transferred and the task is no longer available. def test_perform - assert_difference MoneyTransaction, :count, 2 do + assert_difference 'MoneyTransaction.count', 2 do assert_equal [1,3], available_ids allowance_tasks(:three).perform! assert_equal [1], available_ids test/unit/allowance_task_test.rb @@ -61,7 +61,7 @@ class MoneyTransactionTest < Test::Unit::TestCase def test_bad_creation a=money_accounts(:three) - t=a.transactions.create(:user => users(:dustin), + t=a.transactions.create(:user => users(:quentin), :category => categories(:one), :descr => "Test transaction", :amount => -99.99, :ds => Date.today, :ts => Time.now) test/unit/money_transaction_test.rb @@ -4,98 +4,83 @@ class UserTest < Test::Unit::TestCase # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead. # Then, you can remove it from this and the functional test. include AuthenticatedTestHelper - fixtures :users, :roles, :groups, :group_user_map, - :user_roles_map + fixtures :users, :roles def test_should_create_user - assert_difference User, :count do + assert_difference 'User.count' do user = create_user assert !user.new_record?, "#{user.errors.full_messages.to_sentence}" end end - def test_dustin_is_admin_from_roles_by_string - assert users(:dustin).has_role?('admin') - end - - def test_dustin_is_admin_from_roles_by_object - assert users(:dustin).has_role?(roles(:admin)) - end - - def test_aaron_is_not_admin_from_roles_by_string - assert !users(:aaron).has_role?('admin') - end - - def test_aaron_is_not_admin_from_roles_by_object - assert !users(:aaron).has_role?(roles(:admin)) - end - - def test_dustin_is_admin? - assert users(:dustin).admin? - end - - def test_aaron_is_admin? - assert !users(:aaron).admin? - end - def test_should_require_login - assert_no_difference User, :count do + assert_no_difference 'User.count' do u = create_user(:login => nil) assert u.errors.on(:login) end end def test_should_require_password - assert_no_difference User, :count do + assert_no_difference 'User.count' do u = create_user(:password => nil) assert u.errors.on(:password) end end def test_should_require_password_confirmation - assert_no_difference User, :count do + assert_no_difference 'User.count' do u = create_user(:password_confirmation => nil) assert u.errors.on(:password_confirmation) end end def test_should_require_email - assert_no_difference User, :count do + assert_no_difference 'User.count' do u = create_user(:email => nil) assert u.errors.on(:email) end end def test_should_reset_password - users(:dustin).update_attributes(:password => 'new password', :password_confirmation => 'new password') - assert_equal users(:dustin), User.authenticate('dustin', 'new password') + users(:quentin).update_attributes(:password => 'new password', :password_confirmation => 'new password') + assert_equal users(:quentin), User.authenticate('quentin', 'new password') end def test_should_not_rehash_password - users(:dustin).update_attributes(:login => 'dustin') - assert_equal users(:dustin), User.authenticate('dustin', 'blahblah') + users(:quentin).update_attributes(:login => 'quentin2') + assert_equal users(:quentin), User.authenticate('quentin2', 'test') end def test_should_authenticate_user - assert_equal users(:dustin), User.authenticate('dustin', 'blahblah') + assert_equal users(:quentin), User.authenticate('quentin', 'test') end - def test_should_set_remember_token - users(:dustin).remember_me - assert_not_nil users(:dustin).remember_token - assert_not_nil users(:dustin).remember_token_expires_at - assert users(:dustin).remember_token? + # My tests... + + def test_quentin_is_admin_from_roles_by_string + assert users(:quentin).has_role?('admin') end - def test_should_unset_remember_token - users(:dustin).remember_me - assert_not_nil users(:dustin).remember_token - users(:dustin).forget_me - assert_nil users(:dustin).remember_token - assert !users(:dustin).remember_token? + def test_quentin_is_admin_from_roles_by_object + assert users(:quentin).has_role?(roles(:admin)) + end + + def test_aaron_is_not_admin_from_roles_by_string + assert !users(:aaron).has_role?('admin') + end + + def test_aaron_is_not_admin_from_roles_by_object + assert !users(:aaron).has_role?(roles(:admin)) + end + + def test_quentin_is_admin? + assert users(:quentin).admin? + end + + def test_aaron_is_admin? + assert !users(:aaron).admin? end - # My tests... def test_user_list_length assert_equal(2, User.find(:all).length) end @@ -113,31 +98,14 @@ class UserTest < Test::Unit::TestCase end def test_user_role_map2 - assert_equal [1, 2, 3], users(:dustin).roles.map(&:id).sort - end - - def test_creation - pw='ii28g28g' - u=User.new :login => 'dustin3', :name => 'Dustin Three', - :email => 'dustin+sometest@spy.net', - :password => pw, :password_confirmation => pw - u.save - assert_equal(3, u.id) - assert_equal(u, User.find(3)) - end - - def test_lookup_by_name - u=User.find_by_login('dustin') - assert_equal(1, u.id) + assert_equal [1, 2, 3], users(:quentin).roles.map(&:id).sort end - def test_sorting - assert_equal [2, 1], User.find(:all).sort.map(&:id) +protected + def create_user(options = {}) + User.create({ + :login => 'quire', :email => 'quire@example.com', + :password => 'quire', :name => 'Quire', + :password_confirmation => 'quire' }.merge(options)) end - - protected - def create_user(options = {}) - User.create({ :login => 'quire', :name => "Sum Guy", :email => 'quire@example.com', - :password => 'quire', :password_confirmation => 'quire' }.merge(options)) - end end test/unit/user_test.rb app/views/account/change_password.rhtml app/views/account/login.rhtml app/views/account/signup.rhtml test/functional/account_controller_test.rb vendor/plugins/acts_as_authenticated/CHANGELOG vendor/plugins/acts_as_authenticated/README vendor/plugins/acts_as_authenticated/generators/authenticated/USAGE vendor/plugins/acts_as_authenticated/generators/authenticated/authenticated_generator.rb vendor/plugins/acts_as_authenticated/generators/authenticated/templates/authenticated_system.rb vendor/plugins/acts_as_authenticated/generators/authenticated/templates/authenticated_test_helper.rb vendor/plugins/acts_as_authenticated/generators/authenticated/templates/controller.rb vendor/plugins/acts_as_authenticated/generators/authenticated/templates/fixtures.yml vendor/plugins/acts_as_authenticated/generators/authenticated/templates/functional_test.rb vendor/plugins/acts_as_authenticated/generators/authenticated/templates/helper.rb vendor/plugins/acts_as_authenticated/generators/authenticated/templates/index.rhtml vendor/plugins/acts_as_authenticated/generators/authenticated/templates/login.rhtml vendor/plugins/acts_as_authenticated/generators/authenticated/templates/migration.rb vendor/plugins/acts_as_authenticated/generators/authenticated/templates/model.rb vendor/plugins/acts_as_authenticated/generators/authenticated/templates/signup.rhtml vendor/plugins/acts_as_authenticated/generators/authenticated/templates/unit_test.rb vendor/plugins/acts_as_authenticated/generators/authenticated_mailer/USAGE vendor/plugins/acts_as_authenticated/generators/authenticated_mailer/authenticated_mailer_generator.rb vendor/plugins/acts_as_authenticated/generators/authenticated_mailer/templates/activation.rhtml vendor/plugins/acts_as_authenticated/generators/authenticated_mailer/templates/notifier.rb vendor/plugins/acts_as_authenticated/generators/authenticated_mailer/templates/notifier_test.rb vendor/plugins/acts_as_authenticated/generators/authenticated_mailer/templates/observer.rb vendor/plugins/acts_as_authenticated/generators/authenticated_mailer/templates/signup_notification.rhtml vendor/plugins/acts_as_authenticated/install.rb 6ae6093b8cf70a60b85f81d3a6c1013e60c93c1c Dustin Sallings dustin@spy.net http://github.com/dustin/money/commit/6370f53f7aad536db12e655cddff4d770795b77f 6370f53f7aad536db12e655cddff4d770795b77f 2008-05-22T23:15:55-07:00 2008-05-22T23:15:55-07:00 Update to restful_authentication. 63fe0493bdf58c0c44f7bda80808966fc58ccd42 Dustin Sallings dustin@spy.net