loyal_devise 2.1.2 → 2.1.3

data/test/models/timeoutable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class TimeoutableTest < ActiveSupport::TestCase

data/test/models/token_authenticatable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class TokenAuthenticatableTest < ActiveSupport::TestCase

data/test/models/trackable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class TrackableTest < ActiveSupport::TestCase

data/test/models/validatable_test.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: UTF-8
 require 'test_helper'
 
 class ValidatableTest < ActiveSupport::TestCase
@@ -56,10 +56,15 @@ class ValidatableTest < ActiveSupport::TestCase
   test 'should require confirmation to be set when creating a new record' do
     user = new_user(:password => 'new_password', :password_confirmation => 'blabla')
     assert user.invalid?
-    assert_equal 'doesn\'t match confirmation', user.errors[:password].join
+
+    if Devise.rails4?
+      assert_equal 'doesn\'t match Password', user.errors[:password_confirmation].join
+    else
+      assert_equal 'doesn\'t match confirmation', user.errors[:password].join
+    end
   end
 
-  test 'should require password when updating/reseting password' do
+  test 'should require password when updating/resetting password' do
     user = create_user
 
     user.password = ''
@@ -69,11 +74,16 @@ class ValidatableTest < ActiveSupport::TestCase
     assert_equal 'can\'t be blank', user.errors[:password].join
   end
 
-  test 'should require confirmation when updating/reseting password' do
+  test 'should require confirmation when updating/resetting password' do
     user = create_user
     user.password_confirmation = 'another_password'
     assert user.invalid?
-    assert_equal 'doesn\'t match confirmation', user.errors[:password].join
+
+    if Devise.rails4?
+      assert_equal 'doesn\'t match Password', user.errors[:password_confirmation].join
+    else
+      assert_equal 'doesn\'t match confirmation', user.errors[:password].join
+    end
   end
 
   test 'should require a password with minimum of 6 characters' do
@@ -98,7 +108,7 @@ class ValidatableTest < ActiveSupport::TestCase
     assert_not (user.errors[:password].join =~ /is too long/)
   end
 
-  test 'should complain about length even if possword is not required' do
+  test 'should complain about length even if password is not required' do
     user = new_user(:password => 'x'*129, :password_confirmation => 'x'*129)
     user.stubs(:password_required?).returns(false)
     assert user.invalid?

data/test/models_test.rb

@@ -1,27 +1,5 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
-
-class Configurable < User
-  devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
-         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
-         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
-end
-
-class WithValidation < Admin
-  devise :database_authenticatable, :validatable, :password_length => 2..6
-end
-
-class UserWithValidation < User
-  validates_presence_of :username
-end
-
-class Several < Admin
-  devise :validatable
-  devise :lockable
-end
-
-class Inheritable < Admin
-end
+require 'test_models'
 
 class ActiveRecordTest < ActiveSupport::TestCase
   def include_module?(klass, mod)
@@ -105,7 +83,12 @@ class ActiveRecordTest < ActiveSupport::TestCase
   end
 
   test 'set null fields on migrations' do
-    Admin.create!
+    # Ignore email sending since no email exists.
+    klass = Class.new(Admin) do
+      def send_devise_notification(*); end
+    end
+
+    klass.create!
   end
 end
 

data/test/omniauth/config_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class OmniAuthConfigTest < ActiveSupport::TestCase
@@ -55,4 +54,4 @@ class OmniAuthConfigTest < ActiveSupport::TestCase
     config_class = config.strategy_class
     assert_equal MyStrategy, config_class
   end
-end
+end

data/test/omniauth/url_helpers_test.rb

@@ -1,7 +1,9 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class OmniAuthRoutesTest < ActionController::TestCase
+  ExpectedUrlGeneratiorError = Devise.rails4? ?
+    ActionController::UrlGenerationError : ActionController::RoutingError
+
   tests ApplicationController
 
   def assert_path(action, provider, with_param=true)
@@ -31,7 +33,7 @@ class OmniAuthRoutesTest < ActionController::TestCase
   test 'should generate authorization path' do
     assert_match "/users/auth/facebook", @controller.omniauth_authorize_path(:user, :facebook)
 
-    assert_raise ActionController::RoutingError do
+    assert_raise ExpectedUrlGeneratiorError do
       @controller.omniauth_authorize_path(:user, :github)
     end
   end

data/test/orm/active_record.rb

@@ -1,6 +1,6 @@
-# -*- encoding : utf-8 -*-
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
+ActiveRecord::Base.include_root_in_json = true
 
 ActiveRecord::Migrator.migrate(File.expand_path("../../rails_app/db/migrate/", __FILE__))
 

data/test/orm/mongoid.rb

@@ -1,15 +1,13 @@
-# -*- encoding : utf-8 -*-
 require 'mongoid/version'
 
 Mongoid.configure do |config|
-  config.master  = Mongo::Connection.new('127.0.0.1', 27017).db("devise-test-suite")
+  config.connect_to("devise-test-suite")
   config.use_utc = true
   config.include_root_in_json = true
 end
 
 class ActiveSupport::TestCase
   setup do
-    User.delete_all
-    Admin.delete_all
+    Mongoid.purge!
   end
 end

data/test/parameter_sanitizer_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+require 'devise/parameter_sanitizer'
+
+class BaseSanitizerTest < ActiveSupport::TestCase
+  def sanitizer
+    Devise::BaseSanitizer.new(User, :user, { user: { "email" => "jose" } })
+  end
+
+  test 'returns chosen params' do
+    assert_equal({ "email" => "jose" }, sanitizer.for(:sign_in))
+  end
+end
+
+if defined?(ActionController::StrongParameters)
+  require 'active_model/forbidden_attributes_protection'
+
+  class ParameterSanitizerTest < ActiveSupport::TestCase
+    def sanitizer(params)
+      params = ActionController::Parameters.new(params)
+      Devise::ParameterSanitizer.new(User, :user, params)
+    end
+
+    test 'filters some parameters on sign in by default' do
+      sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid" })
+      assert_equal({ "email" => "jose" }, sanitizer.for(:sign_in))
+    end
+
+    test 'filters some parameters on sign up by default' do
+      sanitizer = sanitizer(user: { "email" => "jose", "role" => "invalid" })
+      assert_equal({ "email" => "jose" }, sanitizer.for(:sign_up))
+    end
+
+    test 'filters some parameters on account update by default' do
+      sanitizer = sanitizer(user: { "email" => "jose", "role" => "invalid" })
+      assert_equal({ "email" => "jose" }, sanitizer.for(:account_update))
+    end
+
+    test 'allows custom hooks' do
+      sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid" })
+      sanitizer.for(:sign_in) { |user| user.permit(:email, :password) }
+      assert_equal({ "email" => "jose", "password" => "invalid" }, sanitizer.for(:sign_in))
+    end
+
+    test 'raises on unknown hooks' do
+      sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid" })
+      assert_raise NotImplementedError do
+        sanitizer.for(:unknown)
+      end
+    end
+  end
+end

data/test/rails_app/Rakefile

@@ -3,8 +3,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
 Rails.application.load_tasks

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'shared_admin'
 
 class Admin < ActiveRecord::Base

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

@@ -1,3 +1,2 @@
-# -*- encoding : utf-8 -*-
 module Shim
-end
+end

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'shared_user'
 
 class User < ActiveRecord::Base

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

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

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class AdminsController < ApplicationController
   before_filter :authenticate_admin!
 

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # Filters added to this controller apply to all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.
 
@@ -6,4 +5,5 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   before_filter :current_user, :unless => :devise_controller?
   before_filter :authenticate_user!, :if => :devise_controller?
+  respond_to *Mime::SET.map(&:to_sym)
 end

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class HomeController < ApplicationController
   def index
   end

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

@@ -1,3 +1,2 @@
-# -*- encoding : utf-8 -*-
 class Publisher::RegistrationsController < ApplicationController
-end
+end

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

@@ -1,3 +1,2 @@
-# -*- encoding : utf-8 -*-
 class Publisher::SessionsController < ApplicationController
-end
+end

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def facebook
     data = env["omniauth.auth"]
@@ -12,4 +11,4 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
     sign_in user
     render :text => ""
   end
-end
+end

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class UsersController < ApplicationController
   prepend_before_filter :current_user, :only => :exhibit
   before_filter :authenticate_user!, :except => [:accept, :exhibit]
@@ -9,6 +8,14 @@ class UsersController < ApplicationController
     respond_with(current_user)
   end
 
+  def edit_form
+    user_session['last_request_at'] = 31.minutes.ago.utc
+  end
+
+  def update_form
+    render :text => 'Update'
+  end
+
   def accept
     @current_user = current_user
   end

data/test/rails_app/app/helpers/application_helper.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
 end

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class Users::Mailer < Devise::Mailer
   default :from     => 'custom@example.com'
 end
@@ -7,3 +6,7 @@ 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/mongoid/admin.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'shared_admin'
 
 class Admin
@@ -7,8 +6,8 @@ class Admin
   include SharedAdmin
 
   ## Database authenticatable
-  field :email,              :type => String, :null => true
-  field :encrypted_password, :type => String, :null => true
+  field :email,              :type => String
+  field :encrypted_password, :type => String
 
   ## Recoverable
   field :reset_password_token,   :type => String
@@ -25,4 +24,6 @@ class Admin
 
   ## Lockable
   field :locked_at, :type => Time
+
+  field :active, :type => Boolean, :default => false
 end

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Shim
   extend ::ActiveSupport::Concern
 
@@ -8,13 +7,12 @@ module Shim
   end
 
   module ClassMethods
-    def last(options={})
-      options.delete(:order) if options[:order] == "id"
-      super(options)
+    def order(attribute)
+      asc(attribute)
     end
 
     def find_by_email(email)
-      first(:conditions => { :email => email })
+      find_by(:email => email)
     end
   end
 

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'shared_user'
 
 class User
@@ -10,8 +9,8 @@ class User
   field :facebook_token, :type => String
 
   ## Database authenticatable
-  field :email,              :type => String, :null => false, :default => ""
-  field :encrypted_password, :type => String, :null => false, :default => ""
+  field :email,              :type => String, :default => ""
+  field :encrypted_password, :type => String, :default => ""
 
   ## Recoverable
   field :reset_password_token,   :type => String

data/test/rails_app/app/views/users/edit_form.html.erb

@@ -0,0 +1 @@
+<%= button_to 'Update', update_form_user_path(current_user), method: 'put' %>

data/test/rails_app/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/test/rails_app/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/test/rails_app/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/test/rails_app/config/application.rb

@@ -1,9 +1,7 @@
-# -*- encoding : utf-8 -*-
 require File.expand_path('../boot', __FILE__)
 
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
 require "rails/test_unit/railtie"
 
 Bundler.require :default, DEVISE_ORM
@@ -18,7 +16,7 @@ require "devise"
 module RailsApp
   class Application < Rails::Application
     # Add additional load paths for your own custom dirs
-    config.autoload_paths.reject!{ |p| p =~ /\/app\/(\w+)$/ && !%w(controllers helpers views).include?($1) }
+    config.autoload_paths.reject!{ |p| p =~ /\/app\/(\w+)$/ && !%w(controllers helpers mailers views).include?($1) }
     config.autoload_paths += [ "#{config.root}/app/#{DEVISE_ORM}" ]
 
     # Configure generators values. Many other options are available, be sure to check the documentation.