devise 2.1.0 → 2.1.2

data/test/integration/recoverable_test.rb

@@ -126,6 +126,12 @@ class PasswordTest < ActionController::IntegrationTest
     assert warden.authenticated?(:user)
   end
 
+  test 'not authenticated user without a reset password token should not be able to visit the page' do
+    get edit_user_password_path
+    assert_response :redirect
+    assert_redirected_to "/users/sign_in"
+  end
+
   test 'not authenticated user with invalid reset password token should not be able to change his password' do
     user = create_user
     reset_password :reset_password_token => 'invalid_reset_password'

data/test/integration/timeoutable_test.rb

@@ -25,7 +25,7 @@ class SessionTimeoutTest < ActionController::IntegrationTest
     assert_equal old_last_request, last_request_at
   end
 
-  test 'not time out user session before default limit time' do
+  test 'does not time out user session before default limit time' do
     sign_in_as_user
     assert_response :success
     assert warden.authenticated?(:user)
@@ -53,10 +53,36 @@ class SessionTimeoutTest < ActionController::IntegrationTest
 
     assert_response :redirect
     assert_redirected_to root_path
+    follow_redirect!
+    assert_contain 'Signed out successfully'
+  end
+
+  test 'time out is not triggered on sign in' do
+    user = sign_in_as_user
+    get expire_user_path(user)
+
+    post "/users/sign_in", :email => user.email, :password => "123456"
 
+    assert_response :redirect
     follow_redirect!
+    assert_contain 'You are signed in'
+  end
 
-    assert_contain 'Signed out successfully'
+  test 'admin does not explode on time out' do
+    admin = sign_in_as_admin
+    get expire_admin_path(admin)
+
+    Admin.send :define_method, :reset_authentication_token! do
+      nil
+    end
+
+    begin
+      get admins_path
+      assert_redirected_to admins_path
+      assert_not warden.authenticated?(:admin)
+    ensure
+      Admin.send(:remove_method, :reset_authentication_token!)
+    end
   end
 
   test 'user configured timeout limit' do

data/test/models/recoverable_test.rb

@@ -97,7 +97,7 @@ class RecoverableTest < ActiveSupport::TestCase
   test 'should reset reset_password_token before send the reset instructions email' do
     user = create_user
     token = user.reset_password_token
-    reset_password_user = User.send_reset_password_instructions(:email => user.email)
+    User.send_reset_password_instructions(:email => user.email)
     assert_not_equal token, user.reload.reset_password_token
   end
 
@@ -142,7 +142,7 @@ class RecoverableTest < ActiveSupport::TestCase
     old_password = user.password
     user.send :generate_reset_password_token!
 
-    reset_password_user = User.reset_password_by_token(
+    User.reset_password_by_token(
       :reset_password_token => user.reset_password_token,
       :password => 'new_password',
       :password_confirmation => 'new_password'
@@ -202,4 +202,4 @@ class RecoverableTest < ActiveSupport::TestCase
       :reset_password_token
     ]
   end
-end
+end

data/test/models_test.rb

@@ -25,7 +25,7 @@ end
 class ActiveRecordTest < ActiveSupport::TestCase
   def include_module?(klass, mod)
     klass.devise_modules.include?(mod) &&
-    klass.included_modules.include?(Devise::Models::const_get(mod.to_s.classify))
+      klass.included_modules.include?(Devise::Models::const_get(mod.to_s.classify))
   end
 
   def assert_include_modules(klass, *modules)
@@ -153,13 +153,13 @@ class CheckFieldsTest < ActiveSupport::TestCase
       devise :database_authenticatable
     end
 
-    exception = assert_raise_with_message Devise::Models::MissingAttribute, "The following attribute(s) is (are) missing on your model: encrypted_password, email" do
+    assert_raise_with_message Devise::Models::MissingAttribute, "The following attribute(s) is (are) missing on your model: encrypted_password, email" do
       Devise::Models.check_fields!(Magician)
     end
   end
 
   test "doesn't raise a NoMethodError exception when the module doesn't have a required_field(klass) class method" do
-     driver = Class.new do
+    driver = Class.new do
       extend Devise::Models
 
       def self.before_validation(instance)

data/test/omniauth/url_helpers_test.rb

@@ -30,7 +30,7 @@ class OmniAuthRoutesTest < ActionController::TestCase
   test 'should generate authorization path' do
     assert_match "/users/auth/facebook", @controller.omniauth_authorize_path(:user, :facebook)
 
-    assert_raise ArgumentError do
+    assert_raise ActionController::RoutingError do
       @controller.omniauth_authorize_path(:user, :github)
     end
   end
@@ -48,11 +48,4 @@ class OmniAuthRoutesTest < ActionController::TestCase
     assert_equal "/users/auth/openid",
                   @controller.omniauth_authorize_path(:user, :openid)
   end
-
-  test 'should set script name in the path if present' do
-    @request.env['SCRIPT_NAME'] = '/q'
-
-    assert_equal "/q/users/auth/facebook",
-                 @controller.omniauth_authorize_path(:user, :facebook)
-  end
 end

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

@@ -3,4 +3,9 @@ class AdminsController < ApplicationController
 
   def index
   end
+
+  def expire
+    admin_session['last_request_at'] = 31.minutes.ago.utc
+    render :text => 'Admin will be expired on next request'
+  end
 end

data/test/rails_app/config/routes.rb

@@ -9,7 +9,9 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :admins, :only => [:index]
+  resources :admins, :only => [:index] do
+    get :expire, :on => :member
+  end
 
   # Users scope
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
@@ -30,10 +32,18 @@ Rails.application.routes.draw do
     match "/private", :to => "home#private", :as => :private
   end
 
+  authenticate(:admin, lambda { |admin| admin.active? }) do
+    match "/private/active", :to => "home#private", :as => :private_active
+  end
+
   authenticated :admin do
     match "/dashboard", :to => "home#admin_dashboard"
   end
 
+  authenticated :admin, lambda { |admin| admin.active? } do
+    match "/dashboard/active", :to => "home#admin_dashboard"
+  end
+
   authenticated do
     match "/dashboard", :to => "home#user_dashboard"
   end

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

@@ -60,6 +60,9 @@ class CreateTables < ActiveRecord::Migration
       ## Lockable
       t.datetime :locked_at
 
+      ## Attribute for testing route blocks
+      t.boolean :active, :default => false
+
       t.timestamps
     end
   end

data/test/support/assertions.rb

@@ -15,14 +15,14 @@ class ActiveSupport::TestCase
   alias :assert_present :assert_not_blank
 
   def assert_email_sent(address = nil, &block)
-    assert_difference('ActionMailer::Base.deliveries.size') { yield }
+    assert_difference('ActionMailer::Base.deliveries.size', &block)
     if address.present?
       assert_equal address, ActionMailer::Base.deliveries.last['to'].to_s
     end
   end
 
   def assert_email_not_sent(&block)
-    assert_no_difference('ActionMailer::Base.deliveries.size') { yield }
+    assert_no_difference('ActionMailer::Base.deliveries.size', &block)
   end
 
   def assert_same_content(result, expected)
@@ -32,11 +32,9 @@ class ActiveSupport::TestCase
     end
   end
 
-  def assert_raise_with_message(exception_klass, message)
-    exception = assert_raise exception_klass do
-      yield
-    end
-
-    assert_equal exception.message, message, "The expected message was #{message} but your exception throwed #{exception.message}"
+  def assert_raise_with_message(exception_klass, message, &block)
+    exception = assert_raise exception_klass, &block
+    assert_equal exception.message, message,
+      "The expected message was #{message} but your exception throwed #{exception.message}"
   end
 end

data/test/support/integration.rb

@@ -24,7 +24,8 @@ class ActionDispatch::IntegrationTest
     @admin ||= begin
       admin = Admin.create!(
         :email => options[:email] || 'admin@test.com',
-        :password => '123456', :password_confirmation => '123456'
+        :password => '123456', :password_confirmation => '123456',
+        :active => options[:active]
       )
       admin.confirm! unless options[:confirm] == false
       admin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
-  requirement: &70295029841060 !ruby/object:Gem::Requirement
+  requirement: &2157810840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70295029841060
+  version_requirements: *2157810840
 - !ruby/object:Gem::Dependency
   name: orm_adapter
-  requirement: &70295029863720 !ruby/object:Gem::Requirement
+  requirement: &2157810340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70295029863720
+  version_requirements: *2157810340
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70295029862760 !ruby/object:Gem::Requirement
+  requirement: &2157809880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295029862760
+  version_requirements: *2157809880
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70295029861220 !ruby/object:Gem::Requirement
+  requirement: &2157809420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70295029861220
+  version_requirements: *2157809420
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -279,21 +279,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2729560930850104924
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2729560930850104924
 requirements: []
 rubyforge_project: devise
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
@@ -405,3 +399,4 @@ test_files:
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
+has_rdoc: