devise 3.2.1 → 4.4.3

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
 end

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

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

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

@@ -1,12 +1,5 @@
-class Users::Mailer < Devise::Mailer
-  default :from     => 'custom@example.com'
-end
+# frozen_string_literal: true
 
-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' }
+class Users::Mailer < Devise::Mailer
+  default from: 'custom@example.com'
 end

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shared_admin'
 
 class Admin
@@ -6,24 +8,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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Shim
   extend ::ActiveSupport::Concern
 
   included do
     include ::Mongoid::Timestamps
-    field :created_at, :type => DateTime
+    field :created_at, type: DateTime
   end
 
   module ClassMethods
@@ -12,7 +14,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shared_user'
 
 class User
@@ -5,35 +7,44 @@ 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
+
+  cattr_accessor :validations_performed
+
+  after_validation :after_validation_callback
+
+  def after_validation_callback
+    # used to check in our test if the validations were called
+    @@validations_performed = true
+  end
 end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+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,41 @@
+# frozen_string_literal: true
+
+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/mongoid/user_with_validations.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "shared_user"
+
+class UserWithValidations
+  include Mongoid::Document
+  include Shim
+  include SharedUser
+
+  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
+
+  ## 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
+
+  validates :email, presence: true
+end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "shared_user_without_email"
+
+class UserWithoutEmail
+  include Mongoid::Document
+  include Shim
+  include SharedUserWithoutEmail
+
+  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
+
+  ## 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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../boot', __FILE__)
 
 require "action_controller/railtie"
@@ -17,20 +19,26 @@ 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 mailers views).include?($1) }
-    config.autoload_paths += [ "#{config.root}/app/#{DEVISE_ORM}" ]
+    config.autoload_paths += ["#{config.root}/app/#{DEVISE_ORM}"]
 
     # Configure generators values. Many other options are available, be sure to check the documentation.
     # 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.assets.enabled = false
+
+    config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
+    rails_version = Gem::Version.new(Rails.version)
+    if DEVISE_ORM == :active_record &&
+       rails_version >= Gem::Version.new('4.2.0') &&
+       rails_version < Gem::Version.new('5.1.0')
+      config.active_record.raise_in_transactional_callbacks = true
+    end
 
     # This was used to break devise in some situations
     config.to_prepare do

data/test/rails_app/config/boot.rb

@@ -1,14 +1,27 @@
+# frozen_string_literal: true
+
 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'
+  module Test
+    # Detection for minor differences between Rails 4 and 5, 5.1, and 5.2 in tests.
+    
+    def self.rails52?
+      Rails.version.start_with? '5.2'
+    end
+
+    def self.rails51?
+      Rails.version.start_with? '5.1'
+    end
+
+    def self.rails5?
+      Rails.version.start_with? '5'
+    end
   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'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/test/rails_app/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the rails application.
 require File.expand_path('../application', __FILE__)
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RailsApp::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.