devise 1.0.11 → 1.1.pre

data/test/models/recoverable_test.rb

@@ -83,7 +83,7 @@ class RecoverableTest < ActiveSupport::TestCase
   test 'should return a new record with errors if user was not found by e-mail' do
     reset_password_user = User.send_reset_password_instructions(:email => "invalid@email.com")
     assert reset_password_user.new_record?
-    assert_match /not found/, reset_password_user.errors[:email]
+    assert_equal "not found", reset_password_user.errors[:email].join
   end
 
   test 'should reset reset_password_token before send the reset instructions email' do
@@ -104,20 +104,20 @@ class RecoverableTest < ActiveSupport::TestCase
     user = create_user
     user.send :generate_reset_password_token!
 
-    reset_password_user = User.reset_password_by_token(:reset_password_token => user.reset_password_token)
+    reset_password_user = User.reset_password!(:reset_password_token => user.reset_password_token)
     assert_equal reset_password_user, user
   end
 
   test 'should a new record with errors if no reset_password_token is found' do
-    reset_password_user = User.reset_password_by_token(:reset_password_token => 'invalid_token')
+    reset_password_user = User.reset_password!(:reset_password_token => 'invalid_token')
     assert reset_password_user.new_record?
-    assert_match /invalid/, reset_password_user.errors[:reset_password_token]
+    assert_equal "is invalid", reset_password_user.errors[:reset_password_token].join
   end
 
   test 'should a new record with errors if reset_password_token is blank' do
-    reset_password_user = User.reset_password_by_token(:reset_password_token => '')
+    reset_password_user = User.reset_password!(:reset_password_token => '')
     assert reset_password_user.new_record?
-    assert_match /blank/, reset_password_user.errors[:reset_password_token]
+    assert_match "can't be blank", reset_password_user.errors[:reset_password_token].join
   end
 
   test 'should reset successfully user password given the new password and confirmation' do
@@ -125,7 +125,7 @@ class RecoverableTest < ActiveSupport::TestCase
     old_password = user.password
     user.send :generate_reset_password_token!
 
-    reset_password_user = User.reset_password_by_token(
+    reset_password_user = User.reset_password!(
       :reset_password_token => user.reset_password_token,
       :password => 'new_password',
       :password_confirmation => 'new_password'

data/test/models/rememberable_test.rb

@@ -1,11 +1,6 @@
 require 'test/test_helper'
 
 class RememberableTest < ActiveSupport::TestCase
-
-  def setup
-    Devise.remember_for = 1
-  end
-
   test 'should respond to remember_me attribute' do
     user = new_user
     assert user.respond_to?(:remember_me)
@@ -54,11 +49,13 @@ class RememberableTest < ActiveSupport::TestCase
   end
 
   test 'valid remember token should also verify if remember is not expired' do
-    user = create_user
-    user.remember_me!
-    user.remember_created_at = 3.days.ago
-    user.save
-    assert_not user.valid_remember_token?(user.remember_token)
+    swap Devise, :remember_for => 1.day do
+      user = create_user
+      user.remember_me!
+      user.remember_created_at = 3.days.ago
+      user.save
+      assert_not user.valid_remember_token?(user.remember_token)
+    end
   end
 
   test 'serialize into cookie' do

data/test/models/validatable_test.rb

@@ -7,31 +7,30 @@ class ValidatableTest < ActiveSupport::TestCase
     user = new_user(:email => nil)
     assert user.invalid?
     assert user.errors[:email]
-    assert_equal 'can\'t be blank', user.errors[:email]
+    assert_equal 'can\'t be blank', user.errors[:email].join
   end
 
   test 'should require uniqueness of email, allowing blank' do
     existing_user = create_user
+
     user = new_user(:email => '')
     assert user.invalid?
-    assert_not_equal 'has already been taken', user.errors[:email]
+    assert_not_equal 'has already been taken', user.errors[:email].join
+
     user.email = existing_user.email
     assert user.invalid?
-    assert user.errors[:email]
-    assert_equal 1, [*user.errors[:email]].size
-    assert_equal 'has already been taken', user.errors[:email]
+    assert_equal 'has already been taken', user.errors[:email].join
   end
 
   test 'should require correct email format, allowing blank' do
     user = new_user(:email => '')
     assert user.invalid?
-    assert_not_equal 'is invalid', user.errors[:email]
+    assert_not_equal 'is invalid', user.errors[:email].join
+
     %w(invalid_email_format email@invalid invalid$character@mail.com other@not 123).each do |email|
       user.email = email
       assert user.invalid?, 'should be invalid with email ' << email
-      assert user.errors[:email]
-      assert_equal 1, [*user.errors[:email]].size
-      assert_equal 'is invalid', user.errors[:email]
+      assert_equal 'is invalid', user.errors[:email].join
     end
   end
 
@@ -39,63 +38,59 @@ class ValidatableTest < ActiveSupport::TestCase
     %w(a.b.c@example.com test_mail@gmail.com any@any.net email@test.br 123@mail.test).each do |email|
       user = new_user(:email => email)
       assert user.valid?, 'should be valid with email ' << email
-      assert_nil user.errors[:email]
+      assert_blank user.errors[:email]
     end
   end
 
   test 'should require password to be set when creating a new record' do
     user = new_user(:password => '', :password_confirmation => '')
     assert user.invalid?
-    assert user.errors[:password]
-    assert_equal 'can\'t be blank', user.errors[:password]
+    assert_equal 'can\'t be blank', user.errors[:password].join
   end
 
   test 'should require confirmation to be set when creating a new record' do
     user = new_user(:password => 'new_password', :password_confirmation => 'blabla')
     assert user.invalid?
-    assert user.errors[:password]
-    assert_equal 'doesn\'t match confirmation', user.errors[:password]
+    assert_equal 'doesn\'t match confirmation', user.errors[:password].join
   end
 
   test 'should require password when updating/reseting password' do
     user = create_user
+
     user.password = ''
     user.password_confirmation = ''
+
     assert user.invalid?
-    assert user.errors[:password]
-    assert_equal 'can\'t be blank', user.errors[:password]
+    assert_equal 'can\'t be blank', user.errors[:password].join
   end
 
   test 'should require confirmation when updating/reseting password' do
     user = create_user
     user.password_confirmation = 'another_password'
     assert user.invalid?
-    assert user.errors[:password]
-    assert_equal 'doesn\'t match confirmation', user.errors[:password]
+    assert_equal 'doesn\'t match confirmation', user.errors[:password].join
   end
 
   test 'should require a password with minimum of 6 characters' do
     user = new_user(:password => '12345', :password_confirmation => '12345')
     assert user.invalid?
-    assert user.errors[:password]
-    assert_equal 'is too short (minimum is 6 characters)', user.errors[:password]
+    assert_equal 'is too short (minimum is 6 characters)', user.errors[:password].join
   end
 
   test 'should require a password with maximum of 20 characters long' do
     user = new_user(:password => 'x'*21, :password_confirmation => 'x'*21)
     assert user.invalid?
-    assert user.errors[:password]
-    assert_equal 'is too long (maximum is 20 characters)', user.errors[:password]
+    assert_equal 'is too long (maximum is 20 characters)', user.errors[:password].join
   end
 
   test 'should not require password length when it\'s not changed' do
     user = create_user.reload
     user.password = user.password_confirmation = nil
     assert user.valid?
+  
     user.password_confirmation = 'confirmation'
     assert user.invalid?
-    assert user.errors[:password]
-    assert_not user.errors[:password].to_a.include?('is too short (minimum is 6 characters)')
+    assert_not (user.errors[:password].join =~ /is too long/)
   end
 
   test 'shuold not be included in objects with invalid API' do

data/test/models_test.rb

@@ -1,7 +1,7 @@
 require 'test/test_helper'
 
 class Configurable < User
-  devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
+  devise :authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
          :stretches => 15, :pepper => 'abcdef', :confirm_within => 5.days,
          :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
 end
@@ -23,21 +23,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
   end
 
   test 'add modules cherry pick' do
-    assert_include_modules Admin, :database_authenticatable, :registerable, :timeoutable
-  end
-
-  test 'order of module inclusion' do
-    correct_module_order   = [:database_authenticatable, :registerable, :timeoutable]
-    incorrect_module_order = [:database_authenticatable, :timeoutable, :registerable]
-
-    assert_include_modules Admin, *incorrect_module_order
-
-    # get module constants from symbol list
-    module_constants = correct_module_order.collect { |mod| Devise::Models::const_get(mod.to_s.classify) }
-
-    # confirm that they adhere to the order in ALL
-    # get included modules, filter out the noise, and reverse the order
-    assert_equal module_constants, (Admin.included_modules & module_constants).reverse
+    assert_include_modules Admin, :authenticatable, :registerable, :timeoutable
   end
 
   test 'set a default value for stretches' do

data/test/orm/active_record.rb

@@ -1,14 +1,13 @@
-require File.join(File.dirname(__FILE__), '..', 'rails_app', 'config', 'environment')
-require 'test_help'
+require File.expand_path('../../rails_app/config/environment', __FILE__)
+require 'rails/test_help'
 
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 ActiveRecord::Schema.define(:version => 1) do
   [:users, :admins, :accounts].each do |table|
     create_table table do |t|
-      t.database_authenticatable :null => table == :admins
+      t.authenticatable :null => table == :admins
 
       if table != :admin
         t.string :username

data/test/orm/mongo_mapper.rb

@@ -1,16 +1,8 @@
-require 'mongo_mapper'
 MongoMapper.database = "devise-test-suite"
 MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
 
-require File.join(File.dirname(__FILE__), '..', 'rails_app', 'config', 'environment')
-require 'test_help'
-
-module MongoMapper::Document
-  # TODO This should not be required
-  def invalid?
-    !valid?
-  end
-end
+require File.expand_path('../../rails_app/config/environment', __FILE__)
+require 'rails/test_help'
 
 class ActiveSupport::TestCase
   setup do

data/test/rails_app/app/active_record/admin.rb

@@ -1,5 +1,5 @@
 class Admin < ActiveRecord::Base
-  devise :database_authenticatable, :registerable, :timeoutable
+  devise :authenticatable, :registerable, :timeoutable
 
   def self.find_for_authentication(conditions)
     last(:conditions => conditions)

data/test/rails_app/app/active_record/user.rb

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
-  devise :database_authenticatable, :http_authenticatable, :confirmable,
-         :lockable, :recoverable, :registerable, :rememberable, :timeoutable,
-         :token_authenticatable, :trackable, :validatable
+  devise :authenticatable, :http_authenticatable, :confirmable, :lockable, :recoverable,
+         :registerable, :rememberable, :timeoutable, :token_authenticatable,
+         :trackable, :validatable
 
   attr_accessible :username, :email, :password, :password_confirmation
 end

data/test/rails_app/app/controllers/application_controller.rb

@@ -2,11 +2,5 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
-
-  # Scrub sensitive parameters from your log
-  filter_parameter_logging :password
-
-  before_filter :current_user
+  protect_from_forgery
 end

data/test/rails_app/app/controllers/sessions_controller.rb

@@ -0,0 +1,6 @@
+class SessionsController < Devise::SessionsController
+  def new
+    flash[:notice] = "Welcome to #{controller_path.inspect} controller!"
+    super
+  end
+end

data/test/rails_app/app/controllers/users_controller.rb

@@ -9,8 +9,4 @@ class UsersController < ApplicationController
     user_session['last_request_at'] = 31.minutes.ago.utc
     render :text => 'User will be expired on next request'
   end
-
-  def show
-    render :text => current_user.id.to_s
-  end
 end

data/test/rails_app/app/mongo_mapper/admin.rb

@@ -1,13 +1,10 @@
 class Admin
   include MongoMapper::Document
-  devise :authenticatable, :registerable, :timeoutable
+  include MongoMapper::Plugins::Callbacks
 
-  def self.find_for_authentication(conditions)
-    last(:conditions => conditions)
-  end
+  devise :authenticatable, :timeoutable
 
-  def self.last(options={})
-    options.merge!(:order => 'email')
-    super options
+  def self.find_for_authentication(conditions)
+    last(:conditions => conditions, :order => "email")
   end
 end

data/test/rails_app/app/mongo_mapper/user.rb

@@ -1,14 +1,11 @@
 class User
   include MongoMapper::Document
+
   key :created_at, DateTime
-  devise :authenticatable, :http_authenticatable, :confirmable, :lockable, :recoverable,
-         :registerable, :rememberable, :timeoutable, :token_authenticatable,
-         :trackable, :validatable
-  # attr_accessible :username, :email, :password, :password_confirmation
 
-  def self.last(options={})
-    options.merge!(:order => 'email')
-    super options
-  end
+  devise :authenticatable, :http_authenticatable, :confirmable, :recoverable,
+         :rememberable, :trackable, :validatable, :timeoutable, :lockable,
+         :token_authenticatable
 
+  # attr_accessible :username, :email, :password, :password_confirmation
 end

data/test/rails_app/config/application.rb

@@ -0,0 +1,32 @@
+require File.expand_path('../boot', __FILE__)
+
+DEVISE_ORM = :active_record unless defined? DEVISE_ORM
+
+require "active_record/railtie" if DEVISE_ORM == :active_record
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
+require "rails/test_unit/railtie"
+
+Bundler.require :default, DEVISE_ORM
+require "devise"
+
+module RailsApp
+  class Application < Rails::Application
+    config.root = File.expand_path("../..", __FILE__)
+
+    # Add additional load paths for your own custom dirs
+    config.load_paths.reject!{ |p| p =~ /\/app\/(\w+)$/ && !%w(controllers helpers views).include?($1) }
+    config.load_paths += [ "#{config.root}/app/#{DEVISE_ORM}" ]
+
+    # Configure generators values. Many other options are available, be sure to check the documentation.
+    # config.generators do |g|
+    #   g.orm             :active_record
+    #   g.template_engine :erb
+    #   g.test_framework  :test_unit, :fixture => true
+    # end
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters << :password
+  end
+end

data/test/rails_app/config/boot.rb

@@ -1,110 +1,9 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-      Rails::GemDependency.add_frozen_gem_path
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion rescue nil
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        min_version = '1.3.2'
-        require 'rubygems'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
+begin
+  require File.expand_path("../../../../.bundle/environment", __FILE__)
+rescue LoadError
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
 end
 
-# All that for this:
-Rails.boot!
+$:.unshift File.expand_path('../../../../lib', __FILE__)