devise 1.1.pre4 → 1.1.rc0

data/test/orm/active_record.rb

@@ -1,28 +1,7 @@
-require File.expand_path('../../rails_app/config/environment', __FILE__)
-require 'rails/test_help'
-
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 
-ActiveRecord::Schema.define(:version => 1) do
-  [:users, :admins, :accounts].each do |table|
-    create_table table do |t|
-      t.authenticatable :null => table == :admins
-
-      if table != :admin
-        t.string :username
-        t.confirmable
-        t.recoverable
-        t.rememberable
-        t.trackable
-        t.lockable
-        t.token_authenticatable
-      end
-
-      t.timestamps
-    end
-  end
-end
+ActiveRecord::Migrator.migrate(File.expand_path("../../rails_app/db/migrate/", __FILE__))
 
 class ActiveSupport::TestCase
   self.use_transactional_fixtures = true

data/test/orm/data_mapper.rb

@@ -0,0 +1 @@
+DataMapper.auto_migrate!

data/test/orm/mongoid.rb

@@ -0,0 +1,10 @@
+Mongoid.configure do |config|
+  config.master = Mongo::Connection.new('127.0.0.1', 27017).db("devise-test-suite")
+end
+
+class ActiveSupport::TestCase
+  setup do
+    User.delete_all
+    Admin.delete_all
+  end
+end

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

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

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

@@ -3,4 +3,6 @@
 
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  before_filter :current_user
 end

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

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

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

@@ -0,0 +1,13 @@
+class Admin
+  include DataMapper::Resource  
+  
+  property :id,   Serial
+  property :username, String
+  
+  devise :authenticatable, :registerable, :timeoutable, :recoverable
+  
+  def self.create!(*args)
+    create(*args)
+  end
+  
+end

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

@@ -0,0 +1,24 @@
+class User
+  include DataMapper::Resource
+  
+  property :id, Serial
+  property :username, String
+  
+  devise :authenticatable, :http_authenticatable, :confirmable, :lockable, :recoverable,
+         :registerable, :rememberable, :timeoutable, :token_authenticatable,
+         :trackable, :validatable
+
+  timestamps :at
+  
+  def save!(*args)
+    save
+  end
+  
+  def self.create!(*args)
+    create(*args)
+  end
+  
+  def self.destroy_all
+    all.destroy
+  end
+end

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

@@ -0,0 +1,15 @@
+class Admin
+  include Mongoid::Document
+
+  devise :authenticatable, :timeoutable, :registerable, :recoverable
+  
+  def self.last(options={})
+    options.delete(:order) if options[:order] == "id"
+    super options
+  end
+  
+  # overwrite equality (because some devise tests use this for asserting model equality) 
+  def ==(other)
+    other.is_a?(self.class) && _id == other._id
+  end
+end

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

@@ -0,0 +1,21 @@
+class User
+  include Mongoid::Document
+
+  field :created_at, :type => 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.delete(:order) if options[:order] == "id"
+    super options
+  end
+  
+  # overwrite equality (because some devise tests use this for asserting model equality) 
+  def ==(other)
+    other.is_a?(self.class) && _id == other._id
+  end
+end

data/test/rails_app/config/application.rb

@@ -1,20 +1,21 @@
 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
+
+begin
+  require "#{DEVISE_ORM}/railtie"
+rescue LoadError
+end
+
 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}" ]
@@ -28,5 +29,9 @@ module RailsApp
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters << :password
+
+    # Cookie settings
+    config.cookie_secret = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'
+    config.session_store :cookie_store, :key => "_my_app"
   end
 end

data/test/rails_app/config/boot.rb

@@ -1,9 +1,13 @@
+unless defined?(DEVISE_ORM)
+  DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
+end
+
 begin
   require File.expand_path("../../../../.bundle/environment", __FILE__)
 rescue LoadError
   require 'rubygems'
   require 'bundler'
-  Bundler.setup
+  Bundler.setup :default, DEVISE_ORM
 end
 
 $:.unshift File.expand_path('../../../../lib', __FILE__)

data/test/rails_app/config/initializers/devise.rb

@@ -36,7 +36,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in DeviseMailer.
   config.mailer_sender = "please-change-me-omg@yourapp.com"
 
-  # Load and configure the ORM. Supports :active_record, :data_mapper and :mongo_mapper.
+  # Load and configure the ORM. Supports :active_record, :data_mapper and :mongoid.
   require "devise/orm/#{DEVISE_ORM}"
 
   # Turn scoped views on. Before rendering "sessions/new", it will first check for

data/test/rails_app/config/routes.rb

@@ -6,7 +6,7 @@ Rails::Application.routes.draw do
   resources :admins, :only => [:index]
 
   devise_for :users
-  devise_for :admin, :as => "admin_area", :controllers => { :sessions => "sessions" }
+  devise_for :admin, :as => "admin_area", :controllers => { :sessions => "sessions" }, :skip => :passwords
   devise_for :accounts, :scope => "manager", :path_prefix => ":locale",
     :class_name => "User", :path_names => {
       :sign_in => "login", :sign_out => "logout",
@@ -17,5 +17,8 @@ Rails::Application.routes.draw do
   match "/admin_area/home", :to => "admins#index", :as => :admin_root
   match "/sign_in", :to => "devise/sessions#new"
 
+  # Dummy route for new admin pasword
+  match "/anywhere", :to => "foo#bar", :as => :new_admin_password
+
   root :to => "home#index"
 end

data/test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -0,0 +1,27 @@
+class CreateTables < ActiveRecord::Migration
+  def self.up
+    [:users, :admins, :accounts].each do |table|
+      create_table table do |t|
+        t.authenticatable :null => table == :admins
+
+        if table != :admin
+          t.string :username
+          t.confirmable
+          t.recoverable
+          t.rememberable
+          t.trackable
+          t.lockable
+          t.token_authenticatable
+        end
+
+        t.timestamps
+      end
+    end
+  end
+
+  def self.down
+    [:users, :admins, :accounts].each do |table|
+      drop_table table
+    end
+  end
+end

data/test/rails_app/db/schema.rb

@@ -0,0 +1,86 @@
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of Active Record to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20100401102949) do
+
+  create_table "accounts", :force => true do |t|
+    t.string   "email",                :default => "", :null => false
+    t.string   "encrypted_password",   :default => "", :null => false
+    t.string   "password_salt",        :default => "", :null => false
+    t.string   "username"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "reset_password_token"
+    t.string   "remember_token"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",        :default => 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.integer  "failed_attempts",      :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "admins", :force => true do |t|
+    t.string   "email",                :default => ""
+    t.string   "encrypted_password",   :default => ""
+    t.string   "password_salt",        :default => ""
+    t.string   "username"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "reset_password_token"
+    t.string   "remember_token"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",        :default => 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.integer  "failed_attempts",      :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "email",                :default => "", :null => false
+    t.string   "encrypted_password",   :default => "", :null => false
+    t.string   "password_salt",        :default => "", :null => false
+    t.string   "username"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "reset_password_token"
+    t.string   "remember_token"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",        :default => 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.integer  "failed_attempts",      :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/test/routes_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require 'test_helper'
 
 class MapRoutingTest < ActionController::TestCase
 
@@ -82,9 +82,9 @@ class MapRoutingTest < ActionController::TestCase
     assert_recognizes({:controller => 'sessions', :action => 'new'}, {:path => 'admin_area/sign_in', :method => :get})
   end
 
-  test 'does not map admin confirmation' do
+  test 'does not map admin password' do
     assert_raise ActionController::RoutingError do
-      assert_recognizes({:controller => 'devise/confirmations', :action => 'new'}, 'admin_area/confirmation/new')
+      assert_recognizes({:controller => 'devise/passwords', :action => 'new'}, 'admin_area/password/new')
     end
   end
 

data/test/support/assertions.rb

@@ -1,3 +1,5 @@
+require 'active_support/test_case'
+
 class ActiveSupport::TestCase
   def assert_not(assertion)
     assert !assertion

data/test/support/helpers.rb

@@ -1,3 +1,5 @@
+require 'active_support/test_case'
+
 class ActiveSupport::TestCase
   VALID_AUTHENTICATION_TOKEN = 'AbCdEfGhIjKlMnOpQrSt'.freeze
 

data/test/support/integration.rb

@@ -1,5 +1,6 @@
-class ActionController::IntegrationTest
+require 'action_dispatch/testing/integration'
 
+class ActionDispatch::IntegrationTest
   def warden
     request.env['warden']
   end
@@ -14,7 +15,7 @@ class ActionController::IntegrationTest
         :created_at => Time.now.utc
       )
       user.confirm! unless options[:confirm] == false
-      user.lock! if options[:locked] == true
+      user.lock_access! if options[:locked] == true
       user
     end
   end
@@ -32,7 +33,7 @@ class ActionController::IntegrationTest
     user = create_user(options)
     get new_user_session_path unless options[:visit] == false
     fill_in 'email', :with => 'user@test.com'
-    fill_in 'password', :with => '123456'
+    fill_in 'password', :with => options[:password] || '123456'
     check 'remember me' if options[:remember_me] == true
     yield if block_given?
     click_button 'Sign In'
@@ -49,10 +50,6 @@ class ActionController::IntegrationTest
     admin
   end
 
-  def assert_current_path(path)
-    assert_equal(prepend_host(path), prepend_host(current_url))
-  end
-
   # Fix assert_redirect_to in integration sessions because they don't take into
   # account Middleware redirects.
   #

data/test/support/webrat/integrations/rails.rb

@@ -1,4 +1,5 @@
 require 'webrat/core/elements/field'
+require 'action_dispatch/testing/integration'
 
 module Webrat
   Field.class_eval do
@@ -8,7 +9,7 @@ module Webrat
   end
 end
 
-module ActionController #:nodoc:
+module ActionDispatch #:nodoc:
   IntegrationTest.class_eval do
     include Webrat::Methods
     include Webrat::Matchers

data/test/test_helper.rb

@@ -1,11 +1,14 @@
 ENV["RAILS_ENV"] = "test"
 DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 
+$:.unshift File.dirname(__FILE__)
 puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
 
-require File.expand_path('../rails_app/config/application', __FILE__)
-require File.expand_path("../orm/#{DEVISE_ORM}", __FILE__)
+require "rails_app/config/environment"
+require "rails/test_help"
+require "orm/#{DEVISE_ORM}"
 
+I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__)
 require 'mocha'
 
 ActionMailer::Base.delivery_method = :test