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

devise 3.5.10 → 4.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (258) hide show

checksums.yaml +5 -5
data/CHANGELOG.md +279 -1126
data/MIT-LICENSE +2 -1
data/README.md +291 -97
data/app/controllers/devise/confirmations_controller.rb +3 -1
data/app/controllers/devise/omniauth_callbacks_controller.rb +8 -6
data/app/controllers/devise/passwords_controller.rb +7 -4
data/app/controllers/devise/registrations_controller.rb +39 -18
data/app/controllers/devise/sessions_controller.rb +9 -7
data/app/controllers/devise/unlocks_controller.rb +4 -2
data/app/controllers/devise_controller.rb +25 -12
data/app/helpers/devise_helper.rb +23 -18
data/app/mailers/devise/mailer.rb +10 -4
data/app/views/devise/confirmations/new.html.erb +2 -2
data/app/views/devise/mailer/email_changed.html.erb +7 -0
data/app/views/devise/passwords/edit.html.erb +3 -3
data/app/views/devise/passwords/new.html.erb +2 -2
data/app/views/devise/registrations/edit.html.erb +9 -5
data/app/views/devise/registrations/new.html.erb +4 -4
data/app/views/devise/sessions/new.html.erb +4 -4
data/app/views/devise/shared/_error_messages.html.erb +15 -0
data/app/views/devise/shared/_links.html.erb +8 -8
data/app/views/devise/unlocks/new.html.erb +2 -2
data/config/locales/en.yml +5 -2
data/lib/devise.rb +57 -40
data/lib/devise/controllers/helpers.rb +30 -27
data/lib/devise/controllers/rememberable.rb +3 -1
data/lib/devise/controllers/scoped_views.rb +2 -0
data/lib/devise/controllers/sign_in_out.rb +39 -14
data/lib/devise/controllers/store_location.rb +25 -7
data/lib/devise/controllers/url_helpers.rb +3 -1
data/lib/devise/delegator.rb +2 -0
data/lib/devise/encryptor.rb +6 -4
data/lib/devise/failure_app.rb +75 -38
data/lib/devise/hooks/activatable.rb +2 -0
data/lib/devise/hooks/csrf_cleaner.rb +2 -0
data/lib/devise/hooks/forgetable.rb +2 -0
data/lib/devise/hooks/lockable.rb +4 -2
data/lib/devise/hooks/proxy.rb +3 -1
data/lib/devise/hooks/rememberable.rb +2 -0
data/lib/devise/hooks/timeoutable.rb +4 -2
data/lib/devise/hooks/trackable.rb +2 -0
data/lib/devise/mailers/helpers.rb +7 -4
data/lib/devise/mapping.rb +3 -1
data/lib/devise/models.rb +3 -1
data/lib/devise/models/authenticatable.rb +63 -33
data/lib/devise/models/confirmable.rb +90 -29
data/lib/devise/models/database_authenticatable.rb +93 -22
data/lib/devise/models/lockable.rb +19 -5
data/lib/devise/models/omniauthable.rb +2 -0
data/lib/devise/models/recoverable.rb +33 -21
data/lib/devise/models/registerable.rb +4 -0
data/lib/devise/models/rememberable.rb +6 -11
data/lib/devise/models/timeoutable.rb +2 -0
data/lib/devise/models/trackable.rb +15 -1
data/lib/devise/models/validatable.rb +10 -3
data/lib/devise/modules.rb +2 -0
data/lib/devise/omniauth.rb +4 -5
data/lib/devise/omniauth/config.rb +2 -0
data/lib/devise/omniauth/url_helpers.rb +14 -5
data/lib/devise/orm/active_record.rb +5 -1
data/lib/devise/orm/mongoid.rb +6 -2
data/lib/devise/parameter_filter.rb +4 -0
data/lib/devise/parameter_sanitizer.rb +139 -65
data/lib/devise/rails.rb +7 -16
data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
data/lib/devise/rails/routes.rb +48 -37
data/lib/devise/rails/warden_compat.rb +3 -10
data/lib/devise/secret_key_finder.rb +27 -0
data/lib/devise/strategies/authenticatable.rb +3 -1
data/lib/devise/strategies/base.rb +2 -0
data/lib/devise/strategies/database_authenticatable.rb +11 -4
data/lib/devise/strategies/rememberable.rb +2 -0
data/lib/devise/test/controller_helpers.rb +167 -0
data/lib/devise/test/integration_helpers.rb +63 -0
data/lib/devise/test_helpers.rb +7 -124
data/lib/devise/time_inflector.rb +2 -0
data/lib/devise/token_generator.rb +3 -41
data/lib/devise/version.rb +3 -1
data/lib/generators/active_record/devise_generator.rb +46 -12
data/lib/generators/active_record/templates/migration.rb +4 -2
data/lib/generators/active_record/templates/migration_existing.rb +4 -2
data/lib/generators/devise/controllers_generator.rb +3 -1
data/lib/generators/devise/devise_generator.rb +5 -3
data/lib/generators/devise/install_generator.rb +18 -5
data/lib/generators/devise/orm_helpers.rb +10 -21
data/lib/generators/devise/views_generator.rb +8 -9
data/lib/generators/mongoid/devise_generator.rb +7 -5
data/lib/generators/templates/README +9 -8
data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +3 -1
data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
data/lib/generators/templates/controllers/registrations_controller.rb +6 -4
data/lib/generators/templates/controllers/sessions_controller.rb +4 -2
data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
data/lib/generators/templates/devise.rb +63 -21
data/lib/generators/templates/markerb/email_changed.markerb +7 -0
data/lib/generators/templates/markerb/password_change.markerb +2 -2
data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +5 -1
data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
data/lib/generators/templates/simple_form_for/sessions/new.html.erb +7 -2
data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
metadata +19 -317
data/.gitignore +0 -10
data/.travis.yml +0 -44
data/.yardopts +0 -9
data/CODE_OF_CONDUCT.md +0 -22
data/CONTRIBUTING.md +0 -16
data/Gemfile +0 -30
data/Gemfile.lock +0 -187
data/Rakefile +0 -36
data/devise.gemspec +0 -27
data/devise.png +0 -0
data/gemfiles/Gemfile.rails-3.2-stable +0 -29
data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -172
data/gemfiles/Gemfile.rails-4.0-stable +0 -30
data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -166
data/gemfiles/Gemfile.rails-4.1-stable +0 -30
data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -171
data/gemfiles/Gemfile.rails-4.2-stable +0 -30
data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -193
data/script/cached-bundle +0 -49
data/script/s3-put +0 -71
data/test/controllers/custom_registrations_controller_test.rb +0 -40
data/test/controllers/custom_strategy_test.rb +0 -62
data/test/controllers/helper_methods_test.rb +0 -21
data/test/controllers/helpers_test.rb +0 -316
data/test/controllers/inherited_controller_i18n_messages_test.rb +0 -51
data/test/controllers/internal_helpers_test.rb +0 -129
data/test/controllers/load_hooks_controller_test.rb +0 -19
data/test/controllers/passwords_controller_test.rb +0 -31
data/test/controllers/sessions_controller_test.rb +0 -103
data/test/controllers/url_helpers_test.rb +0 -65
data/test/delegator_test.rb +0 -19
data/test/devise_test.rb +0 -107
data/test/failure_app_test.rb +0 -315
data/test/generators/active_record_generator_test.rb +0 -109
data/test/generators/controllers_generator_test.rb +0 -48
data/test/generators/devise_generator_test.rb +0 -39
data/test/generators/install_generator_test.rb +0 -13
data/test/generators/mongoid_generator_test.rb +0 -23
data/test/generators/views_generator_test.rb +0 -103
data/test/helpers/devise_helper_test.rb +0 -49
data/test/integration/authenticatable_test.rb +0 -729
data/test/integration/confirmable_test.rb +0 -324
data/test/integration/database_authenticatable_test.rb +0 -95
data/test/integration/http_authenticatable_test.rb +0 -105
data/test/integration/lockable_test.rb +0 -239
data/test/integration/omniauthable_test.rb +0 -135
data/test/integration/recoverable_test.rb +0 -347
data/test/integration/registerable_test.rb +0 -359
data/test/integration/rememberable_test.rb +0 -214
data/test/integration/timeoutable_test.rb +0 -184
data/test/integration/trackable_test.rb +0 -92
data/test/mailers/confirmation_instructions_test.rb +0 -115
data/test/mailers/reset_password_instructions_test.rb +0 -96
data/test/mailers/unlock_instructions_test.rb +0 -91
data/test/mapping_test.rb +0 -134
data/test/models/authenticatable_test.rb +0 -23
data/test/models/confirmable_test.rb +0 -511
data/test/models/database_authenticatable_test.rb +0 -269
data/test/models/lockable_test.rb +0 -350
data/test/models/omniauthable_test.rb +0 -7
data/test/models/recoverable_test.rb +0 -251
data/test/models/registerable_test.rb +0 -7
data/test/models/rememberable_test.rb +0 -169
data/test/models/serializable_test.rb +0 -49
data/test/models/timeoutable_test.rb +0 -51
data/test/models/trackable_test.rb +0 -41
data/test/models/validatable_test.rb +0 -127
data/test/models_test.rb +0 -153
data/test/omniauth/config_test.rb +0 -57
data/test/omniauth/url_helpers_test.rb +0 -54
data/test/orm/active_record.rb +0 -10
data/test/orm/mongoid.rb +0 -13
data/test/parameter_sanitizer_test.rb +0 -81
data/test/rails_app/Rakefile +0 -6
data/test/rails_app/app/active_record/admin.rb +0 -6
data/test/rails_app/app/active_record/shim.rb +0 -2
data/test/rails_app/app/active_record/user.rb +0 -6
data/test/rails_app/app/active_record/user_on_engine.rb +0 -7
data/test/rails_app/app/active_record/user_on_main_app.rb +0 -7
data/test/rails_app/app/active_record/user_without_email.rb +0 -8
data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
data/test/rails_app/app/controllers/admins_controller.rb +0 -6
data/test/rails_app/app/controllers/application_controller.rb +0 -12
data/test/rails_app/app/controllers/application_with_fake_engine.rb +0 -30
data/test/rails_app/app/controllers/custom/registrations_controller.rb +0 -31
data/test/rails_app/app/controllers/home_controller.rb +0 -25
data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
data/test/rails_app/app/controllers/users_controller.rb +0 -31
data/test/rails_app/app/helpers/application_helper.rb +0 -3
data/test/rails_app/app/mailers/users/from_proc_mailer.rb +0 -3
data/test/rails_app/app/mailers/users/mailer.rb +0 -3
data/test/rails_app/app/mailers/users/reply_to_mailer.rb +0 -4
data/test/rails_app/app/mongoid/admin.rb +0 -29
data/test/rails_app/app/mongoid/shim.rb +0 -23
data/test/rails_app/app/mongoid/user.rb +0 -39
data/test/rails_app/app/mongoid/user_on_engine.rb +0 -39
data/test/rails_app/app/mongoid/user_on_main_app.rb +0 -39
data/test/rails_app/app/mongoid/user_without_email.rb +0 -33
data/test/rails_app/app/views/admins/index.html.erb +0 -1
data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
data/test/rails_app/app/views/home/index.html.erb +0 -1
data/test/rails_app/app/views/home/join.html.erb +0 -1
data/test/rails_app/app/views/home/private.html.erb +0 -1
data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
data/test/rails_app/app/views/layouts/application.html.erb +0 -24
data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
data/test/rails_app/app/views/users/index.html.erb +0 -1
data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
data/test/rails_app/bin/bundle +0 -3
data/test/rails_app/bin/rails +0 -4
data/test/rails_app/bin/rake +0 -4
data/test/rails_app/config.ru +0 -4
data/test/rails_app/config/application.rb +0 -40
data/test/rails_app/config/boot.rb +0 -14
data/test/rails_app/config/database.yml +0 -18
data/test/rails_app/config/environment.rb +0 -5
data/test/rails_app/config/environments/development.rb +0 -30
data/test/rails_app/config/environments/production.rb +0 -84
data/test/rails_app/config/environments/test.rb +0 -41
data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
data/test/rails_app/config/initializers/devise.rb +0 -180
data/test/rails_app/config/initializers/inflections.rb +0 -2
data/test/rails_app/config/initializers/secret_token.rb +0 -8
data/test/rails_app/config/initializers/session_store.rb +0 -1
data/test/rails_app/config/routes.rb +0 -125
data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
data/test/rails_app/db/schema.rb +0 -55
data/test/rails_app/lib/shared_admin.rb +0 -17
data/test/rails_app/lib/shared_user.rb +0 -29
data/test/rails_app/lib/shared_user_without_email.rb +0 -26
data/test/rails_app/lib/shared_user_without_omniauth.rb +0 -13
data/test/rails_app/public/404.html +0 -26
data/test/rails_app/public/422.html +0 -26
data/test/rails_app/public/500.html +0 -26
data/test/rails_app/public/favicon.ico +0 -0
data/test/rails_test.rb +0 -9
data/test/routes_test.rb +0 -264
data/test/support/action_controller/record_identifier.rb +0 -10
data/test/support/assertions.rb +0 -39
data/test/support/helpers.rb +0 -77
data/test/support/integration.rb +0 -92
data/test/support/locale/en.yml +0 -8
data/test/support/mongoid.yml +0 -6
data/test/support/webrat/integrations/rails.rb +0 -24
data/test/test_helper.rb +0 -34
data/test/test_helpers_test.rb +0 -178
data/test/test_models.rb +0 -33
data/test/time_helpers.rb +0 -137

data/test/rails_app/lib/shared_admin.rb DELETED Viewed

@@ -1,17 +0,0 @@
-module SharedAdmin
-  extend ActiveSupport::Concern
-  included do
-    devise :database_authenticatable, :registerable,
-           :timeoutable, :recoverable, :lockable, :confirmable,
-           unlock_strategy: :time, lock_strategy: :none,
-           allow_unconfirmed_access_for: 2.weeks, reconfirmable: true
-    validates_length_of     :reset_password_token, minimum: 3, allow_blank: true
-    validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
-  end
-  def raw_confirmation_token
-    @raw_confirmation_token
-  end
-end

data/test/rails_app/lib/shared_user.rb DELETED Viewed

@@ -1,29 +0,0 @@
-module SharedUser
-  extend ActiveSupport::Concern
-  included do
-    devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-           :registerable, :rememberable, :timeoutable,
-           :trackable, :validatable, :omniauthable, password_length: 7..72
-    attr_accessor :other_key
-    # They need to be included after Devise is called.
-    extend ExtendMethods
-  end
-  def raw_confirmation_token
-    @raw_confirmation_token
-  end
-  module ExtendMethods
-    def new_with_session(params, session)
-      super.tap do |user|
-        if data = session["devise.facebook_data"]
-          user.email = data["email"]
-          user.confirmed_at = Time.now
-        end
-      end
-    end
-  end
-end

data/test/rails_app/lib/shared_user_without_email.rb DELETED Viewed

@@ -1,26 +0,0 @@
-module SharedUserWithoutEmail
-  extend ActiveSupport::Concern
-  included do
-    # NOTE: This is missing :validatable and :confirmable, as they both require
-    # an email field at the moment. It is also missing :omniauthable because that
-    # adds unnecessary complexity to the setup
-    devise :database_authenticatable, :lockable, :recoverable,
-           :registerable, :rememberable, :timeoutable,
-           :trackable
-  end
-  # This test stub is a bit rubbish because it's tied very closely to the
-  # implementation where we care about this one case. However, completely
-  # removing the email field breaks "recoverable" tests completely, so we are
-  # just taking the approach here that "email" is something that is a not an
-  # ActiveRecord field.
-  def email_changed?
-    raise NoMethodError
-  end
-  def respond_to?(method_name, include_all=false)
-    return false if method_name.to_sym == :email_changed?
-    super(method_name, include_all)
-  end
-end

data/test/rails_app/lib/shared_user_without_omniauth.rb DELETED Viewed

@@ -1,13 +0,0 @@
-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/rails_app/public/404.html DELETED Viewed

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>The page you were looking for doesn't exist (404)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
-  </style>
-</head>
-<body>
-  <!-- This file lives in public/404.html -->
-  <div class="dialog">
-    <h1>The page you were looking for doesn't exist.</h1>
-    <p>You may have mistyped the address or the page may have moved.</p>
-  </div>
-</body>
-</html>

data/test/rails_app/public/422.html DELETED Viewed

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>The change you wanted was rejected (422)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
-  </style>
-</head>
-<body>
-  <!-- This file lives in public/422.html -->
-  <div class="dialog">
-    <h1>The change you wanted was rejected.</h1>
-    <p>Maybe you tried to change something you didn't have access to.</p>
-  </div>
-</body>
-</html>

data/test/rails_app/public/500.html DELETED Viewed

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>We're sorry, but something went wrong (500)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
-  </style>
-</head>
-<body>
-  <!-- This file lives in public/500.html -->
-  <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
-    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
-  </div>
-</body>
-</html>

data/test/rails_app/public/favicon.ico DELETED Viewed

File without changes

data/test/rails_test.rb DELETED Viewed

@@ -1,9 +0,0 @@
-require 'test_helper'
-class RailsTest < ActiveSupport::TestCase
-  test 'correct initializer position' do
-    initializer = Devise::Engine.initializers.detect { |i| i.name == 'devise.omniauth' }
-    assert_equal :load_config_initializers, initializer.after
-    assert_equal :build_middleware_stack, initializer.before
-  end
-end

data/test/routes_test.rb DELETED Viewed

@@ -1,264 +0,0 @@
-require 'test_helper'
-ExpectedRoutingError = Devise.rails4? ? MiniTest::Assertion : ActionController::RoutingError
-class DefaultRoutingTest < ActionController::TestCase
-  test 'map new user session' do
-    assert_recognizes({controller: 'devise/sessions', action: 'new'}, {path: 'users/sign_in', method: :get})
-    assert_named_route "/users/sign_in", :new_user_session_path
-  end
-  test 'map create user session' do
-    assert_recognizes({controller: 'devise/sessions', action: 'create'}, {path: 'users/sign_in', method: :post})
-    assert_named_route "/users/sign_in", :user_session_path
-  end
-  test 'map destroy user session' do
-    assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: 'users/sign_out', method: :get})
-    assert_named_route "/users/sign_out", :destroy_user_session_path
-  end
-  test 'map new user confirmation' do
-    assert_recognizes({controller: 'devise/confirmations', action: 'new'}, 'users/confirmation/new')
-    assert_named_route "/users/confirmation/new", :new_user_confirmation_path
-  end
-  test 'map create user confirmation' do
-    assert_recognizes({controller: 'devise/confirmations', action: 'create'}, {path: 'users/confirmation', method: :post})
-    assert_named_route "/users/confirmation", :user_confirmation_path
-  end
-  test 'map show user confirmation' do
-    assert_recognizes({controller: 'devise/confirmations', action: 'show'}, {path: 'users/confirmation', method: :get})
-  end
-  test 'map new user password' do
-    assert_recognizes({controller: 'devise/passwords', action: 'new'}, 'users/password/new')
-    assert_named_route "/users/password/new", :new_user_password_path
-  end
-  test 'map create user password' do
-    assert_recognizes({controller: 'devise/passwords', action: 'create'}, {path: 'users/password', method: :post})
-    assert_named_route "/users/password", :user_password_path
-  end
-  test 'map edit user password' do
-    assert_recognizes({controller: 'devise/passwords', action: 'edit'}, 'users/password/edit')
-    assert_named_route "/users/password/edit", :edit_user_password_path
-  end
-  test 'map update user password' do
-    assert_recognizes({controller: 'devise/passwords', action: 'update'}, {path: 'users/password', method: :put})
-  end
-  test 'map new user unlock' do
-    assert_recognizes({controller: 'devise/unlocks', action: 'new'}, 'users/unlock/new')
-    assert_named_route "/users/unlock/new", :new_user_unlock_path
-  end
-  test 'map create user unlock' do
-    assert_recognizes({controller: 'devise/unlocks', action: 'create'}, {path: 'users/unlock', method: :post})
-    assert_named_route "/users/unlock", :user_unlock_path
-  end
-  test 'map show user unlock' do
-    assert_recognizes({controller: 'devise/unlocks', action: 'show'}, {path: 'users/unlock', method: :get})
-  end
-  test 'map new user registration' do
-    assert_recognizes({controller: 'devise/registrations', action: 'new'}, 'users/sign_up')
-    assert_named_route "/users/sign_up", :new_user_registration_path
-  end
-  test 'map create user registration' do
-    assert_recognizes({controller: 'devise/registrations', action: 'create'}, {path: 'users', method: :post})
-    assert_named_route "/users", :user_registration_path
-  end
-  test 'map edit user registration' do
-    assert_recognizes({controller: 'devise/registrations', action: 'edit'}, {path: 'users/edit', method: :get})
-    assert_named_route "/users/edit", :edit_user_registration_path
-  end
-  test 'map update user registration' do
-    assert_recognizes({controller: 'devise/registrations', action: 'update'}, {path: 'users', method: :put})
-  end
-  test 'map destroy user registration' do
-    assert_recognizes({controller: 'devise/registrations', action: 'destroy'}, {path: 'users', method: :delete})
-  end
-  test 'map cancel user registration' do
-    assert_recognizes({controller: 'devise/registrations', action: 'cancel'}, {path: 'users/cancel', method: :get})
-    assert_named_route "/users/cancel", :cancel_user_registration_path
-  end
-  test 'map omniauth callbacks' do
-    assert_recognizes({controller: 'users/omniauth_callbacks', action: 'facebook'}, {path: 'users/auth/facebook/callback', method: :get})
-    assert_recognizes({controller: 'users/omniauth_callbacks', action: 'facebook'}, {path: 'users/auth/facebook/callback', method: :post})
-    assert_named_route "/users/auth/facebook/callback", :user_omniauth_callback_path, :facebook
-    # named open_id
-    assert_recognizes({controller: 'users/omniauth_callbacks', action: 'google'}, {path: 'users/auth/google/callback', method: :get})
-    assert_recognizes({controller: 'users/omniauth_callbacks', action: 'google'}, {path: 'users/auth/google/callback', method: :post})
-    assert_named_route "/users/auth/google/callback", :user_omniauth_callback_path, :google
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'ysers/omniauth_callbacks', action: 'twitter'}, {path: 'users/auth/twitter/callback', method: :get})
-    end
-  end
-  protected
-  def assert_named_route(result, *args)
-    assert_equal result, @routes.url_helpers.send(*args)
-  end
-end
-class CustomizedRoutingTest < ActionController::TestCase
-  test 'map admin with :path option' do
-    assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'admin_area/sign_up', method: :get})
-  end
-  test 'map admin with :controllers option' do
-    assert_recognizes({controller: 'admins/sessions', action: 'new'}, {path: 'admin_area/sign_in', method: :get})
-  end
-  test 'does not map admin password' do
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/passwords', action: 'new'}, 'admin_area/password/new')
-    end
-  end
-  test 'subdomain admin' do
-    assert_recognizes({"host"=>"sub.example.com", controller: 'devise/sessions', action: 'new'}, {host: "sub.example.com", path: '/sub_admin/sign_in', method: :get})
-  end
-  test 'does only map reader password' do
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/sessions', action: 'new'}, 'reader/sessions/new')
-    end
-    assert_recognizes({controller: 'devise/passwords', action: 'new'}, 'reader/password/new')
-  end
-  test 'map account with custom path name for session sign in' do
-    assert_recognizes({controller: 'devise/sessions', action: 'new', locale: 'en'}, '/en/accounts/login')
-  end
-  test 'map account with custom path name for session sign out' do
-    assert_recognizes({controller: 'devise/sessions', action: 'destroy', locale: 'en'}, '/en/accounts/logout')
-  end
-  test 'map account with custom path name for password' do
-    assert_recognizes({controller: 'devise/passwords', action: 'new', locale: 'en'}, '/en/accounts/secret/new')
-  end
-  test 'map account with custom path name for registration' do
-    assert_recognizes({controller: 'devise/registrations', action: 'new', locale: 'en'}, '/en/accounts/management/register')
-  end
-  test 'map account with custom path name for edit registration' do
-    assert_recognizes({controller: 'devise/registrations', action: 'edit', locale: 'en'}, '/en/accounts/management/edit/profile')
-  end
-  test 'map account with custom path name for cancel registration' do
-    assert_recognizes({controller: 'devise/registrations', action: 'cancel', locale: 'en'}, '/en/accounts/management/giveup')
-  end
-  test 'map deletes with :sign_out_via option' do
-    assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/deletes/sign_out', method: :delete})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/deletes/sign_out', method: :get})
-    end
-  end
-  test 'map posts with :sign_out_via option' do
-    assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/posts/sign_out', method: :post})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/posts/sign_out', method: :get})
-    end
-  end
-  test 'map delete_or_posts with :sign_out_via option' do
-    assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/delete_or_posts/sign_out', method: :post})
-    assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/delete_or_posts/sign_out', method: :delete})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/delete_or_posts/sign_out', method: :get})
-    end
-  end
-  test 'map with constraints defined in hash' do
-    assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://192.168.1.100/headquarters/sign_up', method: :get})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://10.0.0.100/headquarters/sign_up', method: :get})
-    end
-  end
-  test 'map with constraints defined in block' do
-    assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://192.168.1.100/homebase/sign_up', method: :get})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://10.0.0.100//homebase/sign_up', method: :get})
-    end
-  end
-  test 'map with format false for sessions' do
-    assert_recognizes({controller: 'devise/sessions', action: 'new'}, {path: '/htmlonly_admin/sign_in', method: :get})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/sessions', action: 'new'}, {path: '/htmlonly_admin/sign_in.xml', method: :get})
-    end
-  end
-  test 'map with format false for passwords' do
-    assert_recognizes({controller: 'devise/passwords', action: 'create'}, {path: '/htmlonly_admin/password', method: :post})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/passwords', action: 'create'}, {path: '/htmlonly_admin/password.xml', method: :post})
-    end
-  end
-  test 'map with format false for registrations' do
-    assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: '/htmlonly_admin/sign_up', method: :get})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: '/htmlonly_admin/sign_up.xml', method: :get})
-    end
-  end
-  test 'map with format false for confirmations' do
-    assert_recognizes({controller: 'devise/confirmations', action: 'show'}, {path: '/htmlonly_users/confirmation', method: :get})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/confirmations', action: 'show'}, {path: '/htmlonly_users/confirmation.xml', method: :get})
-    end
-  end
-  test 'map with format false for unlocks' do
-    assert_recognizes({controller: 'devise/unlocks', action: 'show'}, {path: '/htmlonly_users/unlock', method: :get})
-    assert_raise ExpectedRoutingError do
-      assert_recognizes({controller: 'devise/unlocks', action: 'show'}, {path: '/htmlonly_users/unlock.xml', method: :get})
-    end
-  end
-  test 'map with format false is not permanent' do
-    assert_equal "/set.xml", @routes.url_helpers.set_path(:xml)
-  end
-  test 'checks if mapping has proper configuration for omniauth callback' do
-    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
-class ScopedRoutingTest < ActionController::TestCase
-  test 'map publisher account' do
-    assert_recognizes({controller: 'publisher/registrations', action: 'new'}, {path: '/publisher/accounts/sign_up', method: :get})
-    assert_equal '/publisher/accounts/sign_up', @routes.url_helpers.new_publisher_account_registration_path
-  end
-  test 'map publisher account merges path names' do
-    assert_recognizes({controller: 'publisher/sessions', action: 'new'}, {path: '/publisher/accounts/get_in', method: :get})
-    assert_equal '/publisher/accounts/get_in', @routes.url_helpers.new_publisher_account_session_path
-  end
-end