devise 3.3.0 → 3.4.0

data/test/models/lockable_test.rb

@@ -299,18 +299,24 @@ class LockableTest < ActiveSupport::TestCase
   end
 
   test 'should return last attempt message if user made next-to-last attempt of password entering' do
-    swap Devise, last_attempt_warning: :true do
-      swap Devise, lock_strategy: :failed_attempts do
-        user = create_user
-        user.failed_attempts = Devise.maximum_attempts - 2
-        assert_equal :invalid, user.unauthenticated_message
+    swap Devise, last_attempt_warning: true, lock_strategy: :failed_attempts do
+      user = create_user
+      user.failed_attempts = Devise.maximum_attempts - 2
+      assert_equal :invalid, user.unauthenticated_message
 
-        user.failed_attempts = Devise.maximum_attempts - 1
-        assert_equal :last_attempt, user.unauthenticated_message
+      user.failed_attempts = Devise.maximum_attempts - 1
+      assert_equal :last_attempt, user.unauthenticated_message
 
-        user.failed_attempts = Devise.maximum_attempts
-        assert_equal :locked, user.unauthenticated_message
-      end
+      user.failed_attempts = Devise.maximum_attempts
+      assert_equal :locked, user.unauthenticated_message
+    end
+  end
+
+  test 'should not return last attempt message if last_attempt_warning is disabled' do
+    swap Devise, last_attempt_warning: false, lock_strategy: :failed_attempts do
+      user = create_user
+      user.failed_attempts = Devise.maximum_attempts - 1
+      assert_equal :invalid, user.unauthenticated_message
     end
   end
 

data/test/rails_app/app/mailers/users/from_proc_mailer.rb

@@ -0,0 +1,3 @@
+class Users::FromProcMailer < Devise::Mailer
+  default from: proc { 'custom@example.com' }
+end

data/test/rails_app/app/mailers/users/mailer.rb

@@ -1,12 +1,3 @@
 class Users::Mailer < Devise::Mailer
   default from: 'custom@example.com'
 end
-
-class Users::ReplyToMailer < Devise::Mailer
-  default from: 'custom@example.com'
-  default reply_to: 'custom_reply_to@example.com'
-end
-
-class Users::FromProcMailer < Devise::Mailer
-  default from: proc { 'custom@example.com' }
-end

data/test/rails_app/app/mailers/users/reply_to_mailer.rb

@@ -0,0 +1,4 @@
+class Users::ReplyToMailer < Devise::Mailer
+  default from: 'custom@example.com'
+  default reply_to: 'custom_reply_to@example.com'
+end

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

@@ -33,7 +33,7 @@ class CreateTables < ActiveRecord::Migration
       t.string   :unlock_token # Only if unlock strategy is :email or :both
       t.datetime :locked_at
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :admins do |t|
@@ -60,7 +60,7 @@ class CreateTables < ActiveRecord::Migration
       ## Attribute for testing route blocks
       t.boolean :active, default: false
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

data/test/support/helpers.rb

@@ -8,12 +8,15 @@ class ActiveSupport::TestCase
   end
 
   def store_translations(locale, translations, &block)
-    begin
-      I18n.backend.store_translations(locale, translations)
-      yield
-    ensure
-      I18n.reload!
-    end
+    # Calling 'available_locales' before storing the translations to ensure
+    # that the I18n backend will be initialized before we store our custom
+    # translations, so they will always override the translations for the
+    # YML file.
+    I18n.available_locales
+    I18n.backend.store_translations(locale, translations)
+    yield
+  ensure
+    I18n.reload!
   end
 
   def generate_unique_email

data/test/test_helper.rb

@@ -17,6 +17,10 @@ Webrat.configure do |config|
   config.open_error_files = false
 end
 
+if ActiveSupport.respond_to?(:test_order)
+  ActiveSupport.test_order = :random
+end
+
 OmniAuth.config.logger = Logger.new('/dev/null')
 
 # Add support to load paths so we can overwrite broken webrat setup
@@ -27,3 +31,4 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 require "rails/generators/test_case"
 require "generators/devise/install_generator"
 require "generators/devise/views_generator"
+require "generators/devise/controllers_generator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -87,6 +87,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -121,7 +135,7 @@ files:
 - app/views/devise/registrations/edit.html.erb
 - app/views/devise/registrations/new.html.erb
 - app/views/devise/sessions/new.html.erb
-- app/views/devise/shared/_links.erb
+- app/views/devise/shared/_links.html.erb
 - app/views/devise/unlocks/new.html.erb
 - config/locales/en.yml
 - devise.gemspec
@@ -130,8 +144,8 @@ files:
 - gemfiles/Gemfile.rails-3.2-stable.lock
 - gemfiles/Gemfile.rails-4.0-stable
 - gemfiles/Gemfile.rails-4.0-stable.lock
-- gemfiles/Gemfile.rails-head
-- gemfiles/Gemfile.rails-head.lock
+- gemfiles/Gemfile.rails-4.1-stable
+- gemfiles/Gemfile.rails-4.1-stable.lock
 - lib/devise.rb
 - lib/devise/controllers/helpers.rb
 - lib/devise/controllers/rememberable.rb
@@ -185,12 +199,20 @@ files:
 - lib/generators/active_record/devise_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/active_record/templates/migration_existing.rb
+- lib/generators/devise/controllers_generator.rb
 - lib/generators/devise/devise_generator.rb
 - lib/generators/devise/install_generator.rb
 - lib/generators/devise/orm_helpers.rb
 - lib/generators/devise/views_generator.rb
 - lib/generators/mongoid/devise_generator.rb
 - lib/generators/templates/README
+- lib/generators/templates/controllers/README
+- lib/generators/templates/controllers/confirmations_controller.rb
+- lib/generators/templates/controllers/omniauth_callbacks_controller.rb
+- lib/generators/templates/controllers/passwords_controller.rb
+- lib/generators/templates/controllers/registrations_controller.rb
+- lib/generators/templates/controllers/sessions_controller.rb
+- lib/generators/templates/controllers/unlocks_controller.rb
 - lib/generators/templates/devise.rb
 - lib/generators/templates/markerb/confirmation_instructions.markerb
 - lib/generators/templates/markerb/reset_password_instructions.markerb
@@ -215,6 +237,7 @@ files:
 - test/devise_test.rb
 - test/failure_app_test.rb
 - test/generators/active_record_generator_test.rb
+- test/generators/controllers_generator_test.rb
 - test/generators/devise_generator_test.rb
 - test/generators/install_generator_test.rb
 - test/generators/mongoid_generator_test.rb
@@ -270,7 +293,9 @@ files:
 - test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/mailers/users/from_proc_mailer.rb
 - test/rails_app/app/mailers/users/mailer.rb
+- test/rails_app/app/mailers/users/reply_to_mailer.rb
 - test/rails_app/app/mongoid/admin.rb
 - test/rails_app/app/mongoid/shim.rb
 - test/rails_app/app/mongoid/user.rb
@@ -361,6 +386,7 @@ test_files:
 - test/devise_test.rb
 - test/failure_app_test.rb
 - test/generators/active_record_generator_test.rb
+- test/generators/controllers_generator_test.rb
 - test/generators/devise_generator_test.rb
 - test/generators/install_generator_test.rb
 - test/generators/mongoid_generator_test.rb
@@ -416,7 +442,9 @@ test_files:
 - test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/mailers/users/from_proc_mailer.rb
 - test/rails_app/app/mailers/users/mailer.rb
+- test/rails_app/app/mailers/users/reply_to_mailer.rb
 - test/rails_app/app/mongoid/admin.rb
 - test/rails_app/app/mongoid/shim.rb
 - test/rails_app/app/mongoid/user.rb