From cb990f2d28862b63073ba0e48fb9bec6a86ff8d9 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Wed, 7 Jul 2010 00:10:28 -0300
Subject: [PATCH] Get rid of some deprecation warnings and update Changelog

---
 CHANGELOG.rdoc                            | 3 +++
 test/models_test.rb                       | 2 +-
 test/orm/active_record.rb                 | 2 +-
 test/rails_app/app/active_record/admin.rb | 2 +-
 test/rails_app/app/active_record/user.rb  | 6 +++---
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index a859b131a1..b76390b45e 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,6 @@
+* enhancements
+  * Extracted redirect path from Devise failure app to a new method, allowing override in custom failure apps
+
 == 1.0.8
 
 * enhancements
diff --git a/test/models_test.rb b/test/models_test.rb
index 811d8014de..67ac36743c 100644
--- a/test/models_test.rb
+++ b/test/models_test.rb
@@ -1,7 +1,7 @@
 require 'test/test_helper'
 
 class Configurable < User
-  devise :authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
+  devise :database_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
diff --git a/test/orm/active_record.rb b/test/orm/active_record.rb
index 88e772945f..a98ae3aace 100644
--- a/test/orm/active_record.rb
+++ b/test/orm/active_record.rb
@@ -8,7 +8,7 @@
 ActiveRecord::Schema.define(:version => 1) do
   [:users, :admins, :accounts].each do |table|
     create_table table do |t|
-      t.authenticatable :null => table == :admins
+      t.database_authenticatable :null => table == :admins
 
       if table != :admin
         t.string :username
diff --git a/test/rails_app/app/active_record/admin.rb b/test/rails_app/app/active_record/admin.rb
index e487604229..5a20e2fe65 100644
--- a/test/rails_app/app/active_record/admin.rb
+++ b/test/rails_app/app/active_record/admin.rb
@@ -1,5 +1,5 @@
 class Admin < ActiveRecord::Base
-  devise :authenticatable, :registerable, :timeoutable
+  devise :database_authenticatable, :registerable, :timeoutable
 
   def self.find_for_authentication(conditions)
     last(:conditions => conditions)
diff --git a/test/rails_app/app/active_record/user.rb b/test/rails_app/app/active_record/user.rb
index 1c9bc66829..0c6292fcfd 100644
--- a/test/rails_app/app/active_record/user.rb
+++ b/test/rails_app/app/active_record/user.rb
@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
-  devise :authenticatable, :http_authenticatable, :confirmable, :lockable, :recoverable,
-         :registerable, :rememberable, :timeoutable, :token_authenticatable,
-         :trackable, :validatable
+  devise :database_authenticatable, :http_authenticatable, :confirmable,
+         :lockable, :recoverable, :registerable, :rememberable, :timeoutable,
+         :token_authenticatable, :trackable, :validatable
 
   attr_accessible :username, :email, :password, :password_confirmation
 end