devise 3.2.4 → 3.3.0

data/test/models/trackable_test.rb

@@ -10,4 +10,32 @@ class TrackableTest < ActiveSupport::TestCase
       :sign_in_count
     ]
   end
+
+  test 'update_tracked_fields should only set attributes but not save the record' do
+    user = create_user
+    request = mock
+    request.stubs(:remote_ip).returns("127.0.0.1")
+
+    assert_nil user.current_sign_in_ip
+    assert_nil user.last_sign_in_ip
+    assert_nil user.current_sign_in_at
+    assert_nil user.last_sign_in_at
+    assert_equal 0, user.sign_in_count
+
+    user.update_tracked_fields(request)
+
+    assert_equal "127.0.0.1", user.current_sign_in_ip
+    assert_equal "127.0.0.1", user.last_sign_in_ip
+    assert_not_nil user.current_sign_in_at
+    assert_not_nil user.last_sign_in_at
+    assert_equal 1, user.sign_in_count
+
+    user.reload
+
+    assert_nil user.current_sign_in_ip
+    assert_nil user.last_sign_in_ip
+    assert_nil user.current_sign_in_at
+    assert_nil user.last_sign_in_at
+    assert_equal 0, user.sign_in_count
+  end
 end

data/test/models/validatable_test.rb

@@ -86,10 +86,10 @@ class ValidatableTest < ActiveSupport::TestCase
     end
   end
 
-  test 'should require a password with minimum of 6 characters' do
+  test 'should require a password with minimum of 7 characters' do
     user = new_user(password: '12345', password_confirmation: '12345')
     assert user.invalid?
-    assert_equal 'is too short (minimum is 6 characters)', user.errors[:password].join
+    assert_equal 'is too short (minimum is 7 characters)', user.errors[:password].join
   end
 
   test 'should require a password with maximum of 128 characters long' do

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

@@ -0,0 +1,7 @@
+require 'shared_user_without_omniauth'
+
+class UserOnEngine < ActiveRecord::Base
+  self.table_name = 'users'
+  include Shim
+  include SharedUserWithoutOmniauth
+end

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

@@ -0,0 +1,7 @@
+require 'shared_user_without_omniauth'
+
+class UserOnMainApp < ActiveRecord::Base
+  self.table_name = 'users'
+  include Shim
+  include SharedUserWithoutOmniauth
+end

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

@@ -6,4 +6,7 @@ class ApplicationController < ActionController::Base
   before_filter :current_user, unless: :devise_controller?
   before_filter :authenticate_user!, if: :devise_controller?
   respond_to *Mime::SET.map(&:to_sym)
+
+  devise_group :commenter, contains: [:user, :admin]
 end
+

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

@@ -0,0 +1,30 @@
+class ApplicationWithFakeEngine < ApplicationController
+  private
+
+  helper_method :fake_engine
+  def fake_engine
+    @fake_engine ||= FakeEngine.new
+  end
+end
+
+class FakeEngine
+  def user_on_engine_confirmation_path
+    '/user_on_engine/confirmation'
+  end
+
+  def new_user_on_engine_session_path
+    '/user_on_engine/confirmation/new'
+  end
+
+  def new_user_on_engine_registration_path
+    '/user_on_engine/registration/new'
+  end
+
+  def new_user_on_engine_password_path
+    '/user_on_engine/password/new'
+  end
+
+  def new_user_on_engine_unlock_path
+    '/user_on_engine/unlock/new'
+  end
+end

data/test/rails_app/app/controllers/custom/registrations_controller.rb

@@ -0,0 +1,21 @@
+class Custom::RegistrationsController < Devise::RegistrationsController
+  def create
+    super do |resource|
+      @create_block_called = true
+    end
+  end
+
+  def update
+    super do |resource|
+      @update_block_called = true
+    end
+  end
+
+  def create_block_called?
+    @create_block_called == true
+  end
+
+  def update_block_called?
+    @update_block_called == true
+  end
+end

data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb

@@ -6,7 +6,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def sign_in_facebook
-    user = User.find_by_email('user@test.com')
+    user = User.to_adapter.find_first(email: 'user@test.com')
     user.remember_me = true
     sign_in user
     render text: ""

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

@@ -9,7 +9,7 @@ class UsersController < ApplicationController
   end
 
   def edit_form
-    user_session['last_request_at'] = 31.minutes.ago.utc
+    user_session['last_request_at'] = params.fetch(:last_request_at, 31.minutes.ago.utc)
   end
 
   def update_form

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

@@ -0,0 +1,39 @@
+require 'shared_user_without_omniauth'
+
+class UserOnEngine
+  include Mongoid::Document
+  include Shim
+  include SharedUserWithoutOmniauth
+
+  field :username, type: String
+  field :facebook_token, type: String
+
+  ## Database authenticatable
+  field :email, type: String, default: ""
+  field :encrypted_password, type: String, default: ""
+
+  ## Recoverable
+  field :reset_password_token, type: String
+  field :reset_password_sent_at, type: Time
+
+  ## Rememberable
+  field :remember_created_at, type: Time
+
+  ## Trackable
+  field :sign_in_count, type: Integer, default: 0
+  field :current_sign_in_at, type: Time
+  field :last_sign_in_at, type: Time
+  field :current_sign_in_ip, type: String
+  field :last_sign_in_ip, type: String
+
+  ## Confirmable
+  field :confirmation_token, type: String
+  field :confirmed_at, type: Time
+  field :confirmation_sent_at, type: Time
+  # field :unconfirmed_email,    type: String # Only if using reconfirmable
+
+  ## Lockable
+  field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
+  field :unlock_token, type: String # Only if unlock strategy is :email or :both
+  field :locked_at, type: Time
+end

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

@@ -0,0 +1,39 @@
+require 'shared_user_without_omniauth'
+
+class UserOnMainApp
+  include Mongoid::Document
+  include Shim
+  include SharedUserWithoutOmniauth
+
+  field :username, type: String
+  field :facebook_token, type: String
+
+  ## Database authenticatable
+  field :email, type: String, default: ""
+  field :encrypted_password, type: String, default: ""
+
+  ## Recoverable
+  field :reset_password_token, type: String
+  field :reset_password_sent_at, type: Time
+
+  ## Rememberable
+  field :remember_created_at, type: Time
+
+  ## Trackable
+  field :sign_in_count, type: Integer, default: 0
+  field :current_sign_in_at, type: Time
+  field :last_sign_in_at, type: Time
+  field :current_sign_in_ip, type: String
+  field :last_sign_in_ip, type: String
+
+  ## Confirmable
+  field :confirmation_token, type: String
+  field :confirmed_at, type: Time
+  field :confirmation_sent_at, type: Time
+  # field :unconfirmed_email,    type: String # Only if using reconfirmable
+
+  ## Lockable
+  field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
+  field :unlock_token, type: String # Only if unlock strategy is :email or :both
+  field :locked_at, type: Time
+end

data/test/rails_app/config/application.rb

@@ -30,7 +30,7 @@ module RailsApp
     config.filter_parameters << :password
     config.assets.enabled = false
 
-    config.action_mailer.default_url_options = { host: "localhost:3000" }
+    config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
 
     # This was used to break devise in some situations
     config.to_prepare do

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

@@ -12,6 +12,8 @@ Devise.setup do |config|
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = "please-change-me@config-initializers-devise.com"
 
+
+  config.parent_controller = "ApplicationWithFakeEngine"
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
 

data/test/rails_app/config/routes.rb

@@ -20,12 +20,25 @@ Rails.application.routes.draw do
   # Users scope
   devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
 
+  devise_for :user_on_main_apps,
+    class_name: 'UserOnMainApp',
+    router_name: :main_app,
+    module: :devise
+
+  devise_for :user_on_engines,
+    class_name: 'UserOnEngine',
+    router_name: :fake_engine,
+    module: :devise
+
   as :user do
     get "/as/sign_in", to: "devise/sessions#new"
   end
 
   get "/sign_in", to: "devise/sessions#new"
 
+  # Routes for custom controller testing
+  devise_for :user, only: [:registrations], controllers: { registrations: "custom/registrations" }, as: :custom, path: :custom
+
   # Admin scope
   devise_for :admin, path: "admin_area", controllers: { sessions: :"admins/sessions" }, skip: :passwords
 
@@ -63,6 +76,10 @@ Rails.application.routes.draw do
     devise_for :homebase_admin, class_name: "Admin", path: "homebase"
   end
 
+  scope(subdomain: 'sub') do
+    devise_for :subdomain_users, class_name: "User", only: [:sessions]
+  end
+
   devise_for :skip_admin, class_name: "Admin", skip: :all
 
   # Routes for format=false testing

data/test/rails_app/lib/shared_user.rb

@@ -4,7 +4,7 @@ module SharedUser
   included do
     devise :database_authenticatable, :confirmable, :lockable, :recoverable,
            :registerable, :rememberable, :timeoutable,
-           :trackable, :validatable, :omniauthable
+           :trackable, :validatable, :omniauthable, password_length: 7..128
 
     attr_accessor :other_key
 

data/test/rails_app/lib/shared_user_without_omniauth.rb

@@ -0,0 +1,13 @@
+module SharedUserWithoutOmniauth
+  extend ActiveSupport::Concern
+
+  included do
+    devise :database_authenticatable, :confirmable, :lockable, :recoverable,
+      :registerable, :rememberable, :timeoutable,
+      :trackable, :validatable
+  end
+
+  def raw_confirmation_token
+    @raw_confirmation_token
+  end
+end

data/test/routes_test.rb

@@ -241,11 +241,13 @@ class CustomizedRoutingTest < ActionController::TestCase
   end
 
   test 'checks if mapping has proper configuration for omniauth callback' do
-    assert_raise ArgumentError do
-      @routes.dup.eval_block do
-        devise_for :admin, controllers: {omniauth_callbacks: "users/omniauth_callbacks"}
+    e = assert_raise ArgumentError do
+      routes = ActionDispatch::Routing::RouteSet.new
+      routes.draw do
+        devise_for :not_omniauthable, class_name: 'Admin', controllers: {omniauth_callbacks: "users/omniauth_callbacks"}
       end
     end
+    assert_match "Mapping omniauth_callbacks on a resource that is not omniauthable", e.message
   end
 end
 

data/test/support/assertions.rb

@@ -9,10 +9,9 @@ class ActiveSupport::TestCase
     assert assertion.blank?
   end
 
-  def assert_not_blank(assertion)
-    assert !assertion.blank?
+  def assert_present(assertion)
+    assert assertion.present?
   end
-  alias :assert_present :assert_not_blank
 
   def assert_email_sent(address = nil, &block)
     assert_difference('ActionMailer::Base.deliveries.size', &block)

data/test/support/integration.rb

@@ -40,7 +40,7 @@ class ActionDispatch::IntegrationTest
     fill_in 'password', with: options[:password] || '12345678'
     check 'remember me' if options[:remember_me] == true
     yield if block_given?
-    click_button 'Sign In'
+    click_button 'Log In'
     user
   end
 
@@ -50,7 +50,7 @@ class ActionDispatch::IntegrationTest
     fill_in 'email', with: 'admin@test.com'
     fill_in 'password', with: '123456'
     yield if block_given?
-    click_button 'Sign In'
+    click_button 'Log In'
     admin
   end
 

data/test/test_helper.rb

@@ -17,6 +17,8 @@ Webrat.configure do |config|
   config.open_error_files = false
 end
 
+OmniAuth.config.logger = Logger.new('/dev/null')
+
 # Add support to load paths so we can overwrite broken webrat setup
 $:.unshift File.expand_path('../support', __FILE__)
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/test/test_helpers_test.rb

@@ -4,12 +4,6 @@ class TestHelpersTest < ActionController::TestCase
   tests UsersController
   include Devise::TestHelpers
 
-  class CustomFailureApp < Devise::FailureApp
-    def redirect
-      self.status = 306
-    end
-  end
-
   test "redirects if attempting to access a page unauthenticated" do
     get :index
     assert_redirected_to new_user_session_path
@@ -72,12 +66,30 @@ class TestHelpersTest < ActionController::TestCase
   end
 
   test "respects custom failure app" do
-    begin
-      Devise.warden_config.failure_app = CustomFailureApp
+    custom_failure_app = Class.new(Devise::FailureApp) do
+      def redirect
+        self.status = 306
+      end
+    end
+
+    swap Devise.warden_config, failure_app: custom_failure_app do
       get :index
       assert_response 306
-    ensure
-      Devise.warden_config.failure_app = Devise::FailureApp
+    end
+  end
+
+  test "passes given headers from the failure app to the response" do
+    custom_failure_app = Class.new(Devise::FailureApp) do
+      def respond
+        self.status = 401
+        self.response.headers["CUSTOMHEADER"] = 1
+      end
+    end
+
+    swap Devise.warden_config, failure_app: custom_failure_app do
+      sign_in create_user
+      get :index
+      assert_equal 1, @response.headers["CUSTOMHEADER"]
     end
   end
 
@@ -148,26 +160,4 @@ class TestHelpersTest < ActionController::TestCase
     get :index
     assert_match /User ##{second_user.id}/, @response.body
   end
-
-
-  test "passes  given headers from the failure app to the response" do
-
-    begin
-      old_failure_app = Devise.warden_config[:failure_app]
-      class CustomTestFailureApp < Devise::FailureApp
-        def respond
-          self.status = 401
-          self.response.headers["CUSTOMHEADER"] = 1
-        end
-      end
-      Devise.warden_config[:failure_app] = CustomTestFailureApp
-      user = create_user
-      sign_in user
-      get :index
-      assert_equal 1, @response.headers["CUSTOMHEADER"]
-    ensure
-      Devise.warden_config[:failure_app] = old_failure_app
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.3.0
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -127,8 +127,11 @@ files:
 - devise.gemspec
 - devise.png
 - gemfiles/Gemfile.rails-3.2-stable
+- 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
 - lib/devise.rb
 - lib/devise/controllers/helpers.rb
 - lib/devise/controllers/rememberable.rb
@@ -199,6 +202,9 @@ files:
 - lib/generators/templates/simple_form_for/registrations/new.html.erb
 - lib/generators/templates/simple_form_for/sessions/new.html.erb
 - lib/generators/templates/simple_form_for/unlocks/new.html.erb
+- script/cached-bundle
+- script/s3-put
+- test/controllers/custom_registrations_controller_test.rb
 - test/controllers/custom_strategy_test.rb
 - test/controllers/helpers_test.rb
 - test/controllers/internal_helpers_test.rb
@@ -251,9 +257,13 @@ files:
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
+- test/rails_app/app/active_record/user_on_engine.rb
+- test/rails_app/app/active_record/user_on_main_app.rb
 - test/rails_app/app/controllers/admins/sessions_controller.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/application_with_fake_engine.rb
+- test/rails_app/app/controllers/custom/registrations_controller.rb
 - test/rails_app/app/controllers/home_controller.rb
 - test/rails_app/app/controllers/publisher/registrations_controller.rb
 - test/rails_app/app/controllers/publisher/sessions_controller.rb
@@ -264,6 +274,8 @@ files:
 - test/rails_app/app/mongoid/admin.rb
 - test/rails_app/app/mongoid/shim.rb
 - test/rails_app/app/mongoid/user.rb
+- test/rails_app/app/mongoid/user_on_engine.rb
+- test/rails_app/app/mongoid/user_on_main_app.rb
 - test/rails_app/app/views/admins/index.html.erb
 - test/rails_app/app/views/admins/sessions/new.html.erb
 - test/rails_app/app/views/home/admin_dashboard.html.erb
@@ -297,6 +309,7 @@ files:
 - test/rails_app/db/schema.rb
 - test/rails_app/lib/shared_admin.rb
 - test/rails_app/lib/shared_user.rb
+- test/rails_app/lib/shared_user_without_omniauth.rb
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
 - test/rails_app/public/500.html
@@ -337,6 +350,7 @@ signing_key:
 specification_version: 4
 summary: Flexible authentication solution for Rails with Warden
 test_files:
+- test/controllers/custom_registrations_controller_test.rb
 - test/controllers/custom_strategy_test.rb
 - test/controllers/helpers_test.rb
 - test/controllers/internal_helpers_test.rb
@@ -389,9 +403,13 @@ test_files:
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
+- test/rails_app/app/active_record/user_on_engine.rb
+- test/rails_app/app/active_record/user_on_main_app.rb
 - test/rails_app/app/controllers/admins/sessions_controller.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/application_with_fake_engine.rb
+- test/rails_app/app/controllers/custom/registrations_controller.rb
 - test/rails_app/app/controllers/home_controller.rb
 - test/rails_app/app/controllers/publisher/registrations_controller.rb
 - test/rails_app/app/controllers/publisher/sessions_controller.rb
@@ -402,6 +420,8 @@ test_files:
 - test/rails_app/app/mongoid/admin.rb
 - test/rails_app/app/mongoid/shim.rb
 - test/rails_app/app/mongoid/user.rb
+- test/rails_app/app/mongoid/user_on_engine.rb
+- test/rails_app/app/mongoid/user_on_main_app.rb
 - test/rails_app/app/views/admins/index.html.erb
 - test/rails_app/app/views/admins/sessions/new.html.erb
 - test/rails_app/app/views/home/admin_dashboard.html.erb
@@ -435,6 +455,7 @@ test_files:
 - test/rails_app/db/schema.rb
 - test/rails_app/lib/shared_admin.rb
 - test/rails_app/lib/shared_user.rb
+- test/rails_app/lib/shared_user_without_omniauth.rb
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
 - test/rails_app/public/500.html