RubyGems - devise - Versions diffs - 2.1.2 → 3.5.10 - Mend

devise 2.1.2 → 3.5.10

Potentially problematic release.

This version of devise might be problematic. Click here for more details.

Files changed (242) hide show

checksums.yaml +7 -0
data/.travis.yml +39 -10
data/.yardopts +9 -0
data/{CHANGELOG.rdoc → CHANGELOG.md} +445 -112
data/CODE_OF_CONDUCT.md +22 -0
data/CONTRIBUTING.md +16 -0
data/Gemfile +10 -15
data/Gemfile.lock +151 -129
data/MIT-LICENSE +1 -1
data/README.md +256 -96
data/Rakefile +4 -2
data/app/controllers/devise/confirmations_controller.rb +15 -7
data/app/controllers/devise/omniauth_callbacks_controller.rb +6 -2
data/app/controllers/devise/passwords_controller.rb +33 -9
data/app/controllers/devise/registrations_controller.rb +66 -26
data/app/controllers/devise/sessions_controller.rb +52 -21
data/app/controllers/devise/unlocks_controller.rb +11 -6
data/app/controllers/devise_controller.rb +65 -58
data/app/helpers/devise_helper.rb +2 -2
data/app/mailers/devise/mailer.rb +19 -10
data/app/views/devise/confirmations/new.html.erb +8 -4
data/app/views/devise/mailer/confirmation_instructions.html.erb +2 -2
data/app/views/devise/mailer/password_change.html.erb +3 -0
data/app/views/devise/mailer/reset_password_instructions.html.erb +2 -2
data/app/views/devise/mailer/unlock_instructions.html.erb +2 -2
data/app/views/devise/passwords/edit.html.erb +15 -6
data/app/views/devise/passwords/new.html.erb +8 -4
data/app/views/devise/registrations/edit.html.erb +29 -15
data/app/views/devise/registrations/new.html.erb +19 -8
data/app/views/devise/sessions/new.html.erb +17 -8
data/app/views/devise/shared/{_links.erb → _links.html.erb} +4 -4
data/app/views/devise/unlocks/new.html.erb +8 -4
data/config/locales/en.yml +51 -47
data/devise.gemspec +8 -6
data/devise.png +0 -0
data/gemfiles/Gemfile.rails-3.2-stable +29 -0
data/gemfiles/Gemfile.rails-3.2-stable.lock +172 -0
data/gemfiles/Gemfile.rails-4.0-stable +30 -0
data/gemfiles/Gemfile.rails-4.0-stable.lock +166 -0
data/gemfiles/Gemfile.rails-4.1-stable +30 -0
data/gemfiles/Gemfile.rails-4.1-stable.lock +171 -0
data/gemfiles/Gemfile.rails-4.2-stable +30 -0
data/gemfiles/Gemfile.rails-4.2-stable.lock +193 -0
data/lib/devise/controllers/helpers.rb +126 -108
data/lib/devise/controllers/rememberable.rb +19 -17
data/lib/devise/controllers/scoped_views.rb +1 -1
data/lib/devise/controllers/sign_in_out.rb +96 -0
data/lib/devise/controllers/store_location.rb +58 -0
data/lib/devise/controllers/url_helpers.rb +7 -7
data/lib/devise/encryptor.rb +22 -0
data/lib/devise/failure_app.rb +85 -25
data/lib/devise/hooks/activatable.rb +5 -6
data/lib/devise/hooks/csrf_cleaner.rb +7 -0
data/lib/devise/hooks/forgetable.rb +1 -1
data/lib/devise/hooks/lockable.rb +2 -2
data/lib/devise/hooks/proxy.rb +21 -0
data/lib/devise/hooks/rememberable.rb +5 -4
data/lib/devise/hooks/timeoutable.rb +16 -8
data/lib/devise/hooks/trackable.rb +1 -1
data/lib/devise/mailers/helpers.rb +27 -23
data/lib/devise/mapping.rb +11 -7
data/lib/devise/models/authenticatable.rb +82 -66
data/lib/devise/models/confirmable.rb +142 -55
data/lib/devise/models/database_authenticatable.rb +59 -15
data/lib/devise/models/lockable.rb +41 -30
data/lib/devise/models/omniauthable.rb +3 -3
data/lib/devise/models/recoverable.rb +56 -41
data/lib/devise/models/rememberable.rb +65 -27
data/lib/devise/models/timeoutable.rb +2 -8
data/lib/devise/models/trackable.rb +6 -4
data/lib/devise/models/validatable.rb +9 -9
data/lib/devise/models.rb +4 -13
data/lib/devise/modules.rb +10 -11
data/lib/devise/omniauth/url_helpers.rb +2 -2
data/lib/devise/orm/active_record.rb +1 -1
data/lib/devise/orm/mongoid.rb +1 -1
data/lib/devise/{param_filter.rb → parameter_filter.rb} +10 -11
data/lib/devise/parameter_sanitizer.rb +99 -0
data/lib/devise/rails/routes.rb +173 -115
data/lib/devise/rails/warden_compat.rb +10 -31
data/lib/devise/rails.rb +14 -12
data/lib/devise/strategies/authenticatable.rb +26 -26
data/lib/devise/strategies/base.rb +1 -1
data/lib/devise/strategies/database_authenticatable.rb +8 -4
data/lib/devise/strategies/rememberable.rb +15 -5
data/lib/devise/test_helpers.rb +7 -5
data/lib/devise/time_inflector.rb +14 -0
data/lib/devise/token_generator.rb +70 -0
data/lib/devise/version.rb +1 -1
data/lib/devise.rb +110 -52
data/lib/generators/active_record/devise_generator.rb +34 -18
data/lib/generators/active_record/templates/migration.rb +5 -6
data/lib/generators/active_record/templates/migration_existing.rb +5 -6
data/lib/generators/devise/controllers_generator.rb +44 -0
data/lib/generators/devise/devise_generator.rb +5 -3
data/lib/generators/devise/install_generator.rb +5 -0
data/lib/generators/devise/orm_helpers.rb +25 -6
data/lib/generators/devise/views_generator.rb +52 -22
data/lib/generators/mongoid/devise_generator.rb +21 -26
data/lib/generators/templates/README +9 -5
data/lib/generators/templates/controllers/README +14 -0
data/lib/generators/templates/controllers/confirmations_controller.rb +28 -0
data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +28 -0
data/lib/generators/templates/controllers/passwords_controller.rb +32 -0
data/lib/generators/templates/controllers/registrations_controller.rb +60 -0
data/lib/generators/templates/controllers/sessions_controller.rb +25 -0
data/lib/generators/templates/controllers/unlocks_controller.rb +28 -0
data/lib/generators/templates/devise.rb +80 -43
data/lib/generators/templates/markerb/confirmation_instructions.markerb +2 -2
data/lib/generators/templates/markerb/password_change.markerb +3 -0
data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
data/lib/generators/templates/markerb/unlock_instructions.markerb +2 -2
data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +3 -2
data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +4 -4
data/lib/generators/templates/simple_form_for/passwords/new.html.erb +2 -2
data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -6
data/lib/generators/templates/simple_form_for/registrations/new.html.erb +4 -4
data/lib/generators/templates/simple_form_for/sessions/new.html.erb +6 -6
data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +3 -2
data/script/cached-bundle +49 -0
data/script/s3-put +71 -0
data/test/controllers/custom_registrations_controller_test.rb +40 -0
data/test/controllers/helper_methods_test.rb +21 -0
data/test/controllers/helpers_test.rb +95 -32
data/test/controllers/inherited_controller_i18n_messages_test.rb +51 -0
data/test/controllers/internal_helpers_test.rb +39 -14
data/test/controllers/load_hooks_controller_test.rb +19 -0
data/test/controllers/passwords_controller_test.rb +31 -0
data/test/controllers/sessions_controller_test.rb +66 -6
data/test/controllers/url_helpers_test.rb +10 -4
data/test/delegator_test.rb +1 -1
data/test/devise_test.rb +45 -10
data/test/failure_app_test.rb +121 -27
data/test/generators/active_record_generator_test.rb +48 -8
data/test/generators/controllers_generator_test.rb +48 -0
data/test/generators/devise_generator_test.rb +2 -2
data/test/generators/mongoid_generator_test.rb +3 -3
data/test/generators/views_generator_test.rb +54 -3
data/test/helpers/devise_helper_test.rb +18 -20
data/test/integration/authenticatable_test.rb +161 -65
data/test/integration/confirmable_test.rb +146 -77
data/test/integration/database_authenticatable_test.rb +43 -30
data/test/integration/http_authenticatable_test.rb +30 -22
data/test/integration/lockable_test.rb +64 -49
data/test/integration/omniauthable_test.rb +17 -15
data/test/integration/recoverable_test.rb +111 -70
data/test/integration/registerable_test.rb +114 -79
data/test/integration/rememberable_test.rb +87 -31
data/test/integration/timeoutable_test.rb +77 -33
data/test/integration/trackable_test.rb +5 -5
data/test/mailers/confirmation_instructions_test.rb +28 -8
data/test/mailers/reset_password_instructions_test.rb +21 -8
data/test/mailers/unlock_instructions_test.rb +20 -6
data/test/mapping_test.rb +12 -5
data/test/models/authenticatable_test.rb +17 -1
data/test/models/confirmable_test.rb +216 -62
data/test/models/database_authenticatable_test.rb +129 -49
data/test/models/lockable_test.rb +132 -45
data/test/models/recoverable_test.rb +100 -54
data/test/models/rememberable_test.rb +89 -94
data/test/models/serializable_test.rb +12 -11
data/test/models/timeoutable_test.rb +6 -1
data/test/models/trackable_test.rb +28 -0
data/test/models/validatable_test.rb +31 -21
data/test/models_test.rb +22 -48
data/test/omniauth/config_test.rb +4 -4
data/test/omniauth/url_helpers_test.rb +7 -4
data/test/orm/active_record.rb +1 -0
data/test/orm/mongoid.rb +2 -3
data/test/parameter_sanitizer_test.rb +81 -0
data/test/rails_app/Rakefile +0 -4
data/test/rails_app/app/active_record/shim.rb +1 -1
data/test/rails_app/app/active_record/user_on_engine.rb +7 -0
data/test/rails_app/app/active_record/user_on_main_app.rb +7 -0
data/test/rails_app/app/active_record/user_without_email.rb +8 -0
data/test/rails_app/app/controllers/admins/sessions_controller.rb +1 -1
data/test/rails_app/app/controllers/admins_controller.rb +0 -5
data/test/rails_app/app/controllers/application_controller.rb +6 -2
data/test/rails_app/app/controllers/application_with_fake_engine.rb +30 -0
data/test/rails_app/app/controllers/custom/registrations_controller.rb +31 -0
data/test/rails_app/app/controllers/home_controller.rb +1 -1
data/test/rails_app/app/controllers/publisher/registrations_controller.rb +1 -1
data/test/rails_app/app/controllers/publisher/sessions_controller.rb +1 -1
data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +4 -4
data/test/rails_app/app/controllers/users_controller.rb +12 -4
data/test/rails_app/app/mailers/users/from_proc_mailer.rb +3 -0
data/test/rails_app/app/mailers/users/mailer.rb +1 -1
data/test/rails_app/app/mailers/users/reply_to_mailer.rb +4 -0
data/test/rails_app/app/mongoid/admin.rb +12 -10
data/test/rails_app/app/mongoid/shim.rb +4 -5
data/test/rails_app/app/mongoid/user.rb +19 -22
data/test/rails_app/app/mongoid/user_on_engine.rb +39 -0
data/test/rails_app/app/mongoid/user_on_main_app.rb +39 -0
data/test/rails_app/app/mongoid/user_without_email.rb +33 -0
data/test/rails_app/app/views/admins/sessions/new.html.erb +1 -1
data/test/rails_app/app/views/home/admin_dashboard.html.erb +1 -1
data/test/rails_app/app/views/home/index.html.erb +1 -1
data/test/rails_app/app/views/home/join.html.erb +1 -1
data/test/rails_app/app/views/home/user_dashboard.html.erb +1 -1
data/test/rails_app/app/views/layouts/application.html.erb +1 -1
data/test/rails_app/app/views/users/edit_form.html.erb +1 -0
data/test/rails_app/bin/bundle +3 -0
data/test/rails_app/bin/rails +4 -0
data/test/rails_app/bin/rake +4 -0
data/test/rails_app/config/application.rb +4 -5
data/test/rails_app/config/boot.rb +9 -3
data/test/rails_app/config/environment.rb +2 -2
data/test/rails_app/config/environments/development.rb +19 -7
data/test/rails_app/config/environments/production.rb +68 -17
data/test/rails_app/config/environments/test.rb +24 -16
data/test/rails_app/config/initializers/devise.rb +22 -20
data/test/rails_app/config/initializers/secret_token.rb +8 -2
data/test/rails_app/config/initializers/session_store.rb +1 -0
data/test/rails_app/config/routes.rb +71 -46
data/test/rails_app/db/migrate/20100401102949_create_tables.rb +9 -12
data/test/rails_app/db/schema.rb +21 -18
data/test/rails_app/lib/shared_admin.rb +7 -4
data/test/rails_app/lib/shared_user.rb +6 -3
data/test/rails_app/lib/shared_user_without_email.rb +26 -0
data/test/rails_app/lib/shared_user_without_omniauth.rb +13 -0
data/test/rails_test.rb +9 -0
data/test/routes_test.rb +94 -78
data/test/support/action_controller/record_identifier.rb +10 -0
data/test/support/assertions.rb +2 -3
data/test/support/helpers.rb +18 -32
data/test/support/integration.rb +17 -16
data/test/support/locale/en.yml +4 -0
data/test/support/mongoid.yml +6 -0
data/test/test_helper.rb +8 -1
data/test/test_helpers_test.rb +64 -20
data/test/test_models.rb +33 -0
data/test/time_helpers.rb +137 -0
metadata +172 -51
data/app/views/devise/_links.erb +0 -3
data/gemfiles/Gemfile.rails-3.1.x +0 -35
data/gemfiles/Gemfile.rails-3.1.x.lock +0 -167
data/lib/devise/models/token_authenticatable.rb +0 -77
data/lib/devise/strategies/token_authenticatable.rb +0 -56
data/test/indifferent_hash.rb +0 -33
data/test/integration/token_authenticatable_test.rb +0 -161
data/test/models/token_authenticatable_test.rb +0 -55
data/test/rails_app/script/rails +0 -10

data/test/rails_app/app/views/admins/sessions/new.html.erb CHANGED Viewed

@@ -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 CHANGED Viewed

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

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

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

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

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

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

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

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

@@ -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/app/views/users/edit_form.html.erb ADDED Viewed

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

data/test/rails_app/bin/bundle ADDED Viewed

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

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

data/test/rails_app/config/application.rb CHANGED Viewed

@@ -2,7 +2,6 @@ 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
@@ -17,21 +16,21 @@ 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 += [ "#{config.root}/app/#{DEVISE_ORM}" ]
+    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.
     # 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 CHANGED Viewed

@@ -2,7 +2,13 @@ unless defined?(DEVISE_ORM)
   DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 end
-require 'rubygems'
-require 'bundler/setup'
+module Devise
+  # Detection for minor differences between Rails 3.2 and 4 in tests.
+  def self.rails4?
+    Rails.version.start_with? '4'
+  end
+end
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+# 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/environment.rb CHANGED Viewed

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the rails application.
 require File.expand_path('../application', __FILE__)
-# Initialize the rails application
+# Initialize the rails application.
 RailsApp::Application.initialize!

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

@@ -1,18 +1,30 @@
 RailsApp::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb.
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+  # Only use best-standards-support built into browsers.
+  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
+  # Debug mode disables concatenation and preprocessing of assets.
+  config.assets.debug = true
 end

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

@@ -1,33 +1,84 @@
 RailsApp::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb.
-  # The production environment is meant for finished, "live" apps.
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  if Rails.version >= "4.2.0"
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor  = :uglifier
+  # config.assets.css_compressor = :sass
+  # Whether to fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+  # Generate digests for assets URLs.
+  config.assets.digest = true
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [:subdomain, :uuid]
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
-  # Disable delivery errors, bad email addresses will be ignored
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+  # config.assets.precompile += %w( search.js )
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
-  # Enable threaded mode
-  # config.threadsafe!
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found).
+  config.i18n.fallbacks = true
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 end

data/test/rails_app/config/environments/test.rb CHANGED Viewed

@@ -1,33 +1,41 @@
 RailsApp::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb.
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-  # Show full error reports and disable caching
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  if Rails.version >= "4.2.0"
+    config.serve_static_files = true
+  else
+    config.serve_static_assets = true
+  end
+  config.static_cache_control = "public, max-age=3600"
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-  config.action_dispatch.show_exceptions = false
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end

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

@@ -4,11 +4,16 @@ require "omniauth-openid"
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
+  config.secret_key = "d9eb5171c59a4c817f68b0de27b8c1e340c2341b52cdbc60d3083d4e8958532" \
+                      "18dcc5f589cafde048faec956b61f864b9b5513ff9ce29bf9e5d58b0f234f8e3b"
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # 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"
@@ -26,7 +31,7 @@ Devise.setup do |config|
   # session. If you need permissions, you should implement that in a before filter.
   # You can also supply hash where the value is a boolean expliciting if authentication
   # should be aborted or not if the value is not present. By default is empty.
-  # config.authentication_keys = [ :email ]
+  # config.authentication_keys = [:email]
   # Configure parameters from the request object used for authentication. Each entry
   # given should be a request method and it will automatically be passed to
@@ -38,12 +43,12 @@ Devise.setup do |config|
   # Configure which authentication keys should be case-insensitive.
   # These keys will be downcased upon creating or modifying a user and when used
   # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [ :email ]
+  config.case_insensitive_keys = [:email]
   # Configure which authentication keys should have whitespace stripped.
   # These keys will have whitespace before and after removed upon creating or
   # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [ :email ]
+  config.strip_whitespace_keys = [:email]
   # Tell if authentication through request.params is enabled. True by default.
   # config.params_authenticatable = true
@@ -63,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
@@ -72,21 +77,18 @@ Devise.setup do |config|
   # config.allow_unconfirmed_access_for = 2.days
   # Defines which key will be used when confirming an account
-  # config.confirmation_keys = [ :email ]
+  # config.confirmation_keys = [:email]
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks
-  # If true, a valid remember token can be re-used between multiple browsers.
-  # config.remember_across_browsers = true
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
   # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
-  # config.password_length = 6..128
+  # Range for password length. Default is 8..72.
+  # config.password_length = 8..72
   # Regex to use to validate the email address
   # config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
@@ -103,7 +105,7 @@ Devise.setup do |config|
   # config.lock_strategy = :failed_attempts
   # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [ :email ]
+  # config.unlock_keys = [:email]
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
@@ -122,20 +124,20 @@ Devise.setup do |config|
   # ==> Configuration for :recoverable
   #
   # Defines which key will be used when recovering the password for an account
-  # config.reset_password_keys = [ :email ]
+  # config.reset_password_keys = [:email]
   # Time interval you can reset your password with a reset password key.
   # Don't put a too small interval or your users won't have the time to
   # change their passwords.
   config.reset_password_within = 2.hours
+  # When set to false, does not sign a user in automatically after their password is
+  # reset. Defaults to true, so a user is signed in automatically after a reset.
+  # config.sign_in_after_reset_password = true
   # Setup a pepper to generate the encrypted password.
   config.pepper = "d142367154e5beacca404b1a6a4f8bc52c6fdcfa3ccc3cf8eb49f3458a688ee6ac3b9fae488432a3bfca863b8a90008368a9f3a3dfbe5a962e64b6ab8f3a3a1a"
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
@@ -163,9 +165,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
@@ -173,6 +175,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 CHANGED Viewed

@@ -1,2 +1,8 @@
-Rails.application.config.secret_token = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'
-Rails.application.config.session_store :cookie_store, :key => "_my_app"
+config = Rails.application.config
+if Devise.rails4?
+  config.secret_key_base = 'd588e99efff13a86461fd6ab82327823ad2f8feb5dc217ce652cdd9f0dfc5eb4b5a62a92d24d2574d7d51dfb1ea8dd453ea54e00cf672159a13104a135422a10'
+else
+  config.secret_token = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'
+  config.session_store :cookie_store, key: "_my_app"
+end