devise 3.2.0 → 3.3.0

data/test/omniauth/url_helpers_test.rb

@@ -17,8 +17,8 @@ class OmniAuthRoutesTest < ActionController::TestCase
 
     if with_param
       # Default url params
-      assert_equal @controller.send(action, :user, provider, :param => 123),
-                   @controller.send("user_#{action}", provider, :param => 123)
+      assert_equal @controller.send(action, :user, provider, param: 123),
+                   @controller.send("user_#{action}", provider, param: 123)
     end
   end
 
@@ -44,7 +44,7 @@ class OmniAuthRoutesTest < ActionController::TestCase
 
   test 'should generate authorization path with params' do
     assert_match "/users/auth/openid?openid_url=http%3A%2F%2Fyahoo.com",
-                  @controller.omniauth_authorize_path(:user, :openid, :openid_url => "http://yahoo.com")
+                  @controller.omniauth_authorize_path(:user, :openid, openid_url: "http://yahoo.com")
   end
 
   test 'should not add a "?" if no param was sent' do

data/test/orm/mongoid.rb

@@ -1,7 +1,7 @@
 require 'mongoid/version'
 
 Mongoid.configure do |config|
-  config.connect_to("devise-test-suite")
+  config.load!('test/support/mongoid.yml')
   config.use_utc = true
   config.include_root_in_json = true
 end

data/test/parameter_sanitizer_test.rb

@@ -27,7 +27,7 @@ if defined?(ActionController::StrongParameters)
     end
 
     test 'handles auth keys as a hash' do
-      swap Devise, :authentication_keys => {:email => true} do
+      swap Devise, authentication_keys: {email: true} do
         sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid" })
         assert_equal({ "email" => "jose", "password" => "invalid" }, sanitizer.sanitize(:sign_in))
       end

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

@@ -1,2 +1,2 @@
 module Shim
-end
+end

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/admins/sessions_controller.rb

@@ -3,4 +3,4 @@ class Admins::SessionsController < Devise::SessionsController
     flash[:special] = "Welcome to #{controller_path.inspect} controller!"
     super
   end
-end
+end

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

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

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

@@ -3,7 +3,10 @@
 
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  before_filter :current_user, :unless => :devise_controller?
-  before_filter :authenticate_user!, :if => :devise_controller?
+  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/home_controller.rb

@@ -20,6 +20,6 @@ class HomeController < ApplicationController
   end
 
   def unauthenticated
-    render :text => "unauthenticated", :status => :unauthorized
+    render text: "unauthenticated", status: :unauthorized
   end
 end

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

@@ -1,2 +1,2 @@
 class Publisher::RegistrationsController < ApplicationController
-end
+end

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

@@ -1,2 +1,2 @@
 class Publisher::SessionsController < ApplicationController
-end
+end

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

@@ -2,13 +2,13 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def facebook
     data = env["omniauth.auth"]
     session["devise.facebook_data"] = data["extra"]["user_hash"]
-    render :json => data
+    render json: data
   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 => ""
+    render text: ""
   end
-end
+end

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

@@ -1,6 +1,6 @@
 class UsersController < ApplicationController
-  prepend_before_filter :current_user, :only => :exhibit
-  before_filter :authenticate_user!, :except => [:accept, :exhibit]
+  prepend_before_filter :current_user, only: :exhibit
+  before_filter :authenticate_user!, except: [:accept, :exhibit]
   respond_to :html, :xml
 
   def index
@@ -9,11 +9,11 @@ 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
-    render :text => 'Update'
+    render text: 'Update'
   end
 
   def accept
@@ -21,11 +21,11 @@ class UsersController < ApplicationController
   end
 
   def exhibit
-    render :text => current_user ? "User is authenticated" : "User is not authenticated"
+    render text: current_user ? "User is authenticated" : "User is not authenticated"
   end
 
   def expire
     user_session['last_request_at'] = 31.minutes.ago.utc
-    render :text => 'User will be expired on next request'
+    render text: 'User will be expired on next request'
   end
 end

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

@@ -1,12 +1,12 @@
 class Users::Mailer < Devise::Mailer
-  default :from     => 'custom@example.com'
+  default from: 'custom@example.com'
 end
 
 class Users::ReplyToMailer < Devise::Mailer
-  default :from     => 'custom@example.com'
-  default :reply_to => 'custom_reply_to@example.com'
+  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' }
+  default from: proc { 'custom@example.com' }
 end

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

@@ -6,24 +6,24 @@ class Admin
   include SharedAdmin
 
   ## Database authenticatable
-  field :email,              :type => String
-  field :encrypted_password, :type => String
+  field :email,              type: String
+  field :encrypted_password, type: String
 
   ## Recoverable
-  field :reset_password_token,   :type => String
-  field :reset_password_sent_at, :type => Time
+  field :reset_password_token,   type: String
+  field :reset_password_sent_at, type: Time
 
   ## Rememberable
-  field :remember_created_at, :type => Time
+  field :remember_created_at, type: Time
 
   ## 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
+  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 :locked_at, :type => Time
+  field :locked_at, type: Time
 
-  field :active, :type => Boolean, :default => false
+  field :active, type: Boolean, default: false
 end

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

@@ -3,7 +3,7 @@ module Shim
 
   included do
     include ::Mongoid::Timestamps
-    field :created_at, :type => DateTime
+    field :created_at, type: DateTime
   end
 
   module ClassMethods
@@ -12,7 +12,7 @@ module Shim
     end
 
     def find_by_email(email)
-      find_by(:email => email)
+      find_by(email: email)
     end
   end
 

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

@@ -5,35 +5,35 @@ class User
   include Shim
   include SharedUser
 
-  field :username, :type => String
-  field :facebook_token, :type => String
+  field :username, type: String
+  field :facebook_token, type: String
 
   ## Database authenticatable
-  field :email,              :type => String, :default => ""
-  field :encrypted_password, :type => String, :default => ""
+  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
+  field :reset_password_token,   type: String
+  field :reset_password_sent_at, type: Time
 
   ## Rememberable
-  field :remember_created_at, :type => Time
+  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
+  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
+  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
+  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_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/app/views/admins/sessions/new.html.erb

@@ -1,2 +1,2 @@
 Welcome to "sessions/new" view!
-<%= render :file => "devise/sessions/new" %>
+<%= render file: "devise/sessions/new" %>

data/test/rails_app/app/views/home/admin_dashboard.html.erb

@@ -1 +1 @@
-Admin dashboard
+Admin dashboard

data/test/rails_app/app/views/home/index.html.erb

@@ -1 +1 @@
-Home!
+Home!

data/test/rails_app/app/views/home/join.html.erb

@@ -1 +1 @@
-Join
+Join

data/test/rails_app/app/views/home/user_dashboard.html.erb

@@ -1 +1 @@
-User dashboard
+User dashboard

data/test/rails_app/app/views/layouts/application.html.erb

@@ -7,7 +7,7 @@
   <body>
     <div id="container">
       <%- flash.each do |name, msg| -%>
-        <%= content_tag :div, msg, :id => "flash_#{name}" %>
+        <%= content_tag :div, msg, id: "flash_#{name}" %>
       <%- end -%>
 
       <% if user_signed_in? -%>

data/test/rails_app/config/application.rb

@@ -23,14 +23,14 @@ module RailsApp
     # config.generators do |g|
     #   g.orm             :active_record
     #   g.template_engine :erb
-    #   g.test_framework  :test_unit, :fixture => true
+    #   g.test_framework  :test_unit, fixture: true
     # end
 
     # Configure sensitive parameters which will be filtered from the log file.
     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/boot.rb

@@ -2,7 +2,13 @@ unless defined?(DEVISE_ORM)
   DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 end
 
+module Devise
+  # Detection for minor differences between Rails 3.2 and 4 in tests.
+  def self.rails4?
+    Rails.version.start_with? '4'
+  end
+end
+
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
-
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/rails_app/config/environments/development.rb

@@ -22,10 +22,6 @@ RailsApp::Application.configure do
   # Only use best-standards-support built into browsers.
   config.action_dispatch.best_standards_support = :builtin
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL).
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Raise an error on page load if there are pending migrations
   config.active_record.migration_error = :page_load
 

data/test/rails_app/config/environments/production.rb

@@ -72,10 +72,6 @@ RailsApp::Application.configure do
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL).
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Disable automatic flushing of the log to improve performance.
   # config.autoflush_log = false
 

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"
 
@@ -66,8 +68,8 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # ==> Configuration for :confirmable
-  # The time you want to give your user to confirm his account. During this time
-  # he will be able to access your application without confirming. Default is nil.
+  # The time you want to give your user to confirm their account. During this time
+  # they will be able to access your application without confirming. Default is nil.
   # When allow_unconfirmed_access_for is zero, the user won't be able to sign in without confirming.
   # You can use this to let your user access some features of your application
   # without confirming the account, but blocking it after a certain period
@@ -166,9 +168,9 @@ Devise.setup do |config|
   # config.sign_out_via = :get
 
   # ==> OmniAuth
-  config.omniauth :facebook, 'APP_ID', 'APP_SECRET', :scope => 'email,offline_access'
+  config.omniauth :facebook, 'APP_ID', 'APP_SECRET', scope: 'email,offline_access'
   config.omniauth :openid
-  config.omniauth :openid, :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
+  config.omniauth :openid, name: 'google', identifier: 'https://www.google.com/accounts/o8/id'
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
@@ -176,6 +178,6 @@ Devise.setup do |config|
   #
   # config.warden do |manager|
   #   manager.failure_app = AnotherApp
-  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
   # end
 end

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

@@ -4,5 +4,5 @@ if Devise.rails4?
   config.secret_key_base = 'd588e99efff13a86461fd6ab82327823ad2f8feb5dc217ce652cdd9f0dfc5eb4b5a62a92d24d2574d7d51dfb1ea8dd453ea54e00cf672159a13104a135422a10'
 else
   config.secret_token = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'
-  config.session_store :cookie_store, :key => "_my_app"
+  config.session_store :cookie_store, key: "_my_app"
 end