devise 4.1.1 → 4.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/CHANGELOG.md +224 -4
- data/MIT-LICENSE +2 -1
- data/README.md +275 -90
- data/app/controllers/devise/confirmations_controller.rb +2 -0
- data/app/controllers/devise/omniauth_callbacks_controller.rb +7 -5
- data/app/controllers/devise/passwords_controller.rb +3 -0
- data/app/controllers/devise/registrations_controller.rb +34 -13
- data/app/controllers/devise/sessions_controller.rb +3 -1
- data/app/controllers/devise/unlocks_controller.rb +2 -0
- data/app/controllers/devise_controller.rb +5 -3
- 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 +39 -17
- data/lib/devise/controllers/helpers.rb +22 -9
- 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 +2 -0
- data/lib/devise/failure_app.rb +63 -33
- 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 +6 -3
- data/lib/devise/mapping.rb +3 -1
- data/lib/devise/models.rb +3 -1
- data/lib/devise/models/authenticatable.rb +63 -37
- data/lib/devise/models/confirmable.rb +79 -22
- data/lib/devise/models/database_authenticatable.rb +86 -17
- data/lib/devise/models/lockable.rb +17 -3
- data/lib/devise/models/omniauthable.rb +2 -0
- data/lib/devise/models/recoverable.rb +32 -20
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +5 -3
- 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 +2 -51
- 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 +15 -56
- data/lib/devise/rails.rb +6 -6
- data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
- data/lib/devise/rails/routes.rb +9 -7
- data/lib/devise/rails/warden_compat.rb +2 -0
- 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 +8 -1
- 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 -129
- data/lib/devise/time_inflector.rb +2 -0
- data/lib/devise/token_generator.rb +2 -0
- data/lib/devise/version.rb +3 -1
- data/lib/generators/active_record/devise_generator.rb +40 -12
- data/lib/generators/active_record/templates/migration.rb +3 -1
- data/lib/generators/active_record/templates/migration_existing.rb +2 -0
- 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 +3 -5
- data/lib/generators/devise/orm_helpers.rb +9 -3
- 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 +4 -2
- data/lib/generators/templates/controllers/sessions_controller.rb +3 -1
- data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
- data/lib/generators/templates/devise.rb +49 -6
- 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 +16 -297
- 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 -182
- data/Rakefile +0 -36
- data/bin/test +0 -13
- data/devise.gemspec +0 -26
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-4.1-stable +0 -30
- data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -170
- data/gemfiles/Gemfile.rails-4.2-stable +0 -30
- data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -192
- data/gemfiles/Gemfile.rails-5.0-beta +0 -37
- data/gemfiles/Gemfile.rails-5.0-beta.lock +0 -199
- data/test/controllers/custom_registrations_controller_test.rb +0 -40
- data/test/controllers/custom_strategy_test.rb +0 -64
- data/test/controllers/helper_methods_test.rb +0 -22
- 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 -127
- data/test/controllers/load_hooks_controller_test.rb +0 -19
- data/test/controllers/passwords_controller_test.rb +0 -32
- data/test/controllers/sessions_controller_test.rb +0 -106
- 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 -320
- data/test/generators/active_record_generator_test.rb +0 -83
- 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 -24
- 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 -698
- 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 -106
- data/test/integration/lockable_test.rb +0 -240
- data/test/integration/omniauthable_test.rb +0 -135
- data/test/integration/recoverable_test.rb +0 -347
- data/test/integration/registerable_test.rb +0 -357
- data/test/integration/rememberable_test.rb +0 -211
- 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 -119
- data/test/models_test.rb +0 -153
- data/test/omniauth/config_test.rb +0 -57
- data/test/omniauth/url_helpers_test.rb +0 -51
- data/test/orm/active_record.rb +0 -17
- data/test/orm/mongoid.rb +0 -13
- data/test/parameter_sanitizer_test.rb +0 -131
- 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 -7
- 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 -11
- 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 -29
- 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 -44
- 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 -46
- 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 -3
- data/test/rails_app/config/initializers/session_store.rb +0 -1
- data/test/rails_app/config/routes.rb +0 -126
- 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 -30
- 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 -279
- 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/http_method_compatibility.rb +0 -51
- 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 -33
- data/test/test_helper.rb +0 -34
- data/test/test_helpers_test.rb +0 -178
- data/test/test_models.rb +0 -33
data/test/rails_app/db/schema.rb
DELETED
@@ -1,55 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
# This file is auto-generated from the current state of the database. Instead
|
3
|
-
# of editing this file, please use the migrations feature of Active Record to
|
4
|
-
# incrementally modify your database, and then regenerate this schema definition.
|
5
|
-
#
|
6
|
-
# Note that this schema.rb definition is the authoritative source for your
|
7
|
-
# database schema. If you need to create the application database on another
|
8
|
-
# system, you should be using db:schema:load, not running all the migrations
|
9
|
-
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
|
10
|
-
# you'll amass, the slower it'll run and the greater likelihood for issues).
|
11
|
-
#
|
12
|
-
# It's strongly recommended that you check this file into your version control system.
|
13
|
-
|
14
|
-
ActiveRecord::Schema.define(version: 20100401102949) do
|
15
|
-
|
16
|
-
create_table "admins", force: true do |t|
|
17
|
-
t.string "email"
|
18
|
-
t.string "encrypted_password"
|
19
|
-
t.string "reset_password_token"
|
20
|
-
t.datetime "reset_password_sent_at"
|
21
|
-
t.datetime "remember_created_at"
|
22
|
-
t.string "confirmation_token"
|
23
|
-
t.datetime "confirmed_at"
|
24
|
-
t.datetime "confirmation_sent_at"
|
25
|
-
t.string "unconfirmed_email"
|
26
|
-
t.datetime "locked_at"
|
27
|
-
t.boolean "active", default: false
|
28
|
-
t.datetime "created_at"
|
29
|
-
t.datetime "updated_at"
|
30
|
-
end
|
31
|
-
|
32
|
-
create_table "users", force: true do |t|
|
33
|
-
t.string "username"
|
34
|
-
t.string "facebook_token"
|
35
|
-
t.string "email", default: "", null: false
|
36
|
-
t.string "encrypted_password", default: "", null: false
|
37
|
-
t.string "reset_password_token"
|
38
|
-
t.datetime "reset_password_sent_at"
|
39
|
-
t.datetime "remember_created_at"
|
40
|
-
t.integer "sign_in_count", default: 0
|
41
|
-
t.datetime "current_sign_in_at"
|
42
|
-
t.datetime "last_sign_in_at"
|
43
|
-
t.string "current_sign_in_ip"
|
44
|
-
t.string "last_sign_in_ip"
|
45
|
-
t.string "confirmation_token"
|
46
|
-
t.datetime "confirmed_at"
|
47
|
-
t.datetime "confirmation_sent_at"
|
48
|
-
t.integer "failed_attempts", default: 0
|
49
|
-
t.string "unlock_token"
|
50
|
-
t.datetime "locked_at"
|
51
|
-
t.datetime "created_at"
|
52
|
-
t.datetime "updated_at"
|
53
|
-
end
|
54
|
-
|
55
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
module SharedAdmin
|
2
|
-
extend ActiveSupport::Concern
|
3
|
-
|
4
|
-
included do
|
5
|
-
devise :database_authenticatable, :registerable,
|
6
|
-
:timeoutable, :recoverable, :lockable, :confirmable,
|
7
|
-
unlock_strategy: :time, lock_strategy: :none,
|
8
|
-
allow_unconfirmed_access_for: 2.weeks, reconfirmable: true
|
9
|
-
|
10
|
-
validates_length_of :reset_password_token, minimum: 3, allow_blank: true
|
11
|
-
validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
|
12
|
-
end
|
13
|
-
|
14
|
-
def raw_confirmation_token
|
15
|
-
@raw_confirmation_token
|
16
|
-
end
|
17
|
-
end
|
@@ -1,30 +0,0 @@
|
|
1
|
-
module SharedUser
|
2
|
-
extend ActiveSupport::Concern
|
3
|
-
|
4
|
-
included do
|
5
|
-
devise :database_authenticatable, :confirmable, :lockable, :recoverable,
|
6
|
-
:registerable, :rememberable, :timeoutable,
|
7
|
-
:trackable, :validatable, :omniauthable, password_length: 7..72,
|
8
|
-
reconfirmable: false
|
9
|
-
|
10
|
-
attr_accessor :other_key
|
11
|
-
|
12
|
-
# They need to be included after Devise is called.
|
13
|
-
extend ExtendMethods
|
14
|
-
end
|
15
|
-
|
16
|
-
def raw_confirmation_token
|
17
|
-
@raw_confirmation_token
|
18
|
-
end
|
19
|
-
|
20
|
-
module ExtendMethods
|
21
|
-
def new_with_session(params, session)
|
22
|
-
super.tap do |user|
|
23
|
-
if data = session["devise.facebook_data"]
|
24
|
-
user.email = data["email"]
|
25
|
-
user.confirmed_at = Time.now
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
@@ -1,26 +0,0 @@
|
|
1
|
-
module SharedUserWithoutEmail
|
2
|
-
extend ActiveSupport::Concern
|
3
|
-
|
4
|
-
included do
|
5
|
-
# NOTE: This is missing :validatable and :confirmable, as they both require
|
6
|
-
# an email field at the moment. It is also missing :omniauthable because that
|
7
|
-
# adds unnecessary complexity to the setup
|
8
|
-
devise :database_authenticatable, :lockable, :recoverable,
|
9
|
-
:registerable, :rememberable, :timeoutable,
|
10
|
-
:trackable
|
11
|
-
end
|
12
|
-
|
13
|
-
# This test stub is a bit rubbish because it's tied very closely to the
|
14
|
-
# implementation where we care about this one case. However, completely
|
15
|
-
# removing the email field breaks "recoverable" tests completely, so we are
|
16
|
-
# just taking the approach here that "email" is something that is a not an
|
17
|
-
# ActiveRecord field.
|
18
|
-
def email_changed?
|
19
|
-
raise NoMethodError
|
20
|
-
end
|
21
|
-
|
22
|
-
def respond_to?(method_name, include_all=false)
|
23
|
-
return false if method_name.to_sym == :email_changed?
|
24
|
-
super(method_name, include_all)
|
25
|
-
end
|
26
|
-
end
|
@@ -1,13 +0,0 @@
|
|
1
|
-
module SharedUserWithoutOmniauth
|
2
|
-
extend ActiveSupport::Concern
|
3
|
-
|
4
|
-
included do
|
5
|
-
devise :database_authenticatable, :confirmable, :lockable, :recoverable,
|
6
|
-
:registerable, :rememberable, :timeoutable,
|
7
|
-
:trackable, :validatable, reconfirmable: false
|
8
|
-
end
|
9
|
-
|
10
|
-
def raw_confirmation_token
|
11
|
-
@raw_confirmation_token
|
12
|
-
end
|
13
|
-
end
|
@@ -1,26 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html>
|
3
|
-
<head>
|
4
|
-
<title>The page you were looking for doesn't exist (404)</title>
|
5
|
-
<style type="text/css">
|
6
|
-
body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
|
7
|
-
div.dialog {
|
8
|
-
width: 25em;
|
9
|
-
padding: 0 4em;
|
10
|
-
margin: 4em auto 0 auto;
|
11
|
-
border: 1px solid #ccc;
|
12
|
-
border-right-color: #999;
|
13
|
-
border-bottom-color: #999;
|
14
|
-
}
|
15
|
-
h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
|
16
|
-
</style>
|
17
|
-
</head>
|
18
|
-
|
19
|
-
<body>
|
20
|
-
<!-- This file lives in public/404.html -->
|
21
|
-
<div class="dialog">
|
22
|
-
<h1>The page you were looking for doesn't exist.</h1>
|
23
|
-
<p>You may have mistyped the address or the page may have moved.</p>
|
24
|
-
</div>
|
25
|
-
</body>
|
26
|
-
</html>
|
@@ -1,26 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html>
|
3
|
-
<head>
|
4
|
-
<title>The change you wanted was rejected (422)</title>
|
5
|
-
<style type="text/css">
|
6
|
-
body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
|
7
|
-
div.dialog {
|
8
|
-
width: 25em;
|
9
|
-
padding: 0 4em;
|
10
|
-
margin: 4em auto 0 auto;
|
11
|
-
border: 1px solid #ccc;
|
12
|
-
border-right-color: #999;
|
13
|
-
border-bottom-color: #999;
|
14
|
-
}
|
15
|
-
h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
|
16
|
-
</style>
|
17
|
-
</head>
|
18
|
-
|
19
|
-
<body>
|
20
|
-
<!-- This file lives in public/422.html -->
|
21
|
-
<div class="dialog">
|
22
|
-
<h1>The change you wanted was rejected.</h1>
|
23
|
-
<p>Maybe you tried to change something you didn't have access to.</p>
|
24
|
-
</div>
|
25
|
-
</body>
|
26
|
-
</html>
|
@@ -1,26 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html>
|
3
|
-
<head>
|
4
|
-
<title>We're sorry, but something went wrong (500)</title>
|
5
|
-
<style type="text/css">
|
6
|
-
body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
|
7
|
-
div.dialog {
|
8
|
-
width: 25em;
|
9
|
-
padding: 0 4em;
|
10
|
-
margin: 4em auto 0 auto;
|
11
|
-
border: 1px solid #ccc;
|
12
|
-
border-right-color: #999;
|
13
|
-
border-bottom-color: #999;
|
14
|
-
}
|
15
|
-
h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
|
16
|
-
</style>
|
17
|
-
</head>
|
18
|
-
|
19
|
-
<body>
|
20
|
-
<!-- This file lives in public/500.html -->
|
21
|
-
<div class="dialog">
|
22
|
-
<h1>We're sorry, but something went wrong.</h1>
|
23
|
-
<p>We've been notified about this issue and we'll take a look at it shortly.</p>
|
24
|
-
</div>
|
25
|
-
</body>
|
26
|
-
</html>
|
File without changes
|
data/test/rails_test.rb
DELETED
@@ -1,9 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
|
3
|
-
class RailsTest < ActiveSupport::TestCase
|
4
|
-
test 'correct initializer position' do
|
5
|
-
initializer = Devise::Engine.initializers.detect { |i| i.name == 'devise.omniauth' }
|
6
|
-
assert_equal :load_config_initializers, initializer.after
|
7
|
-
assert_equal :build_middleware_stack, initializer.before
|
8
|
-
end
|
9
|
-
end
|
data/test/routes_test.rb
DELETED
@@ -1,279 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
|
3
|
-
ExpectedRoutingError = MiniTest::Assertion
|
4
|
-
|
5
|
-
class DefaultRoutingTest < ActionController::TestCase
|
6
|
-
test 'map new user session' do
|
7
|
-
assert_recognizes({controller: 'devise/sessions', action: 'new'}, {path: 'users/sign_in', method: :get})
|
8
|
-
assert_named_route "/users/sign_in", :new_user_session_path
|
9
|
-
end
|
10
|
-
|
11
|
-
test 'map create user session' do
|
12
|
-
assert_recognizes({controller: 'devise/sessions', action: 'create'}, {path: 'users/sign_in', method: :post})
|
13
|
-
assert_named_route "/users/sign_in", :user_session_path
|
14
|
-
end
|
15
|
-
|
16
|
-
test 'map destroy user session' do
|
17
|
-
assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: 'users/sign_out', method: :delete})
|
18
|
-
assert_named_route "/users/sign_out", :destroy_user_session_path
|
19
|
-
end
|
20
|
-
|
21
|
-
test 'map new user confirmation' do
|
22
|
-
assert_recognizes({controller: 'devise/confirmations', action: 'new'}, 'users/confirmation/new')
|
23
|
-
assert_named_route "/users/confirmation/new", :new_user_confirmation_path
|
24
|
-
end
|
25
|
-
|
26
|
-
test 'map create user confirmation' do
|
27
|
-
assert_recognizes({controller: 'devise/confirmations', action: 'create'}, {path: 'users/confirmation', method: :post})
|
28
|
-
assert_named_route "/users/confirmation", :user_confirmation_path
|
29
|
-
end
|
30
|
-
|
31
|
-
test 'map show user confirmation' do
|
32
|
-
assert_recognizes({controller: 'devise/confirmations', action: 'show'}, {path: 'users/confirmation', method: :get})
|
33
|
-
end
|
34
|
-
|
35
|
-
test 'map new user password' do
|
36
|
-
assert_recognizes({controller: 'devise/passwords', action: 'new'}, 'users/password/new')
|
37
|
-
assert_named_route "/users/password/new", :new_user_password_path
|
38
|
-
end
|
39
|
-
|
40
|
-
test 'map create user password' do
|
41
|
-
assert_recognizes({controller: 'devise/passwords', action: 'create'}, {path: 'users/password', method: :post})
|
42
|
-
assert_named_route "/users/password", :user_password_path
|
43
|
-
end
|
44
|
-
|
45
|
-
test 'map edit user password' do
|
46
|
-
assert_recognizes({controller: 'devise/passwords', action: 'edit'}, 'users/password/edit')
|
47
|
-
assert_named_route "/users/password/edit", :edit_user_password_path
|
48
|
-
end
|
49
|
-
|
50
|
-
test 'map update user password' do
|
51
|
-
assert_recognizes({controller: 'devise/passwords', action: 'update'}, {path: 'users/password', method: :put})
|
52
|
-
end
|
53
|
-
|
54
|
-
test 'map new user unlock' do
|
55
|
-
assert_recognizes({controller: 'devise/unlocks', action: 'new'}, 'users/unlock/new')
|
56
|
-
assert_named_route "/users/unlock/new", :new_user_unlock_path
|
57
|
-
end
|
58
|
-
|
59
|
-
test 'map create user unlock' do
|
60
|
-
assert_recognizes({controller: 'devise/unlocks', action: 'create'}, {path: 'users/unlock', method: :post})
|
61
|
-
assert_named_route "/users/unlock", :user_unlock_path
|
62
|
-
end
|
63
|
-
|
64
|
-
test 'map show user unlock' do
|
65
|
-
assert_recognizes({controller: 'devise/unlocks', action: 'show'}, {path: 'users/unlock', method: :get})
|
66
|
-
end
|
67
|
-
|
68
|
-
test 'map new user registration' do
|
69
|
-
assert_recognizes({controller: 'devise/registrations', action: 'new'}, 'users/sign_up')
|
70
|
-
assert_named_route "/users/sign_up", :new_user_registration_path
|
71
|
-
end
|
72
|
-
|
73
|
-
test 'map create user registration' do
|
74
|
-
assert_recognizes({controller: 'devise/registrations', action: 'create'}, {path: 'users', method: :post})
|
75
|
-
assert_named_route "/users", :user_registration_path
|
76
|
-
end
|
77
|
-
|
78
|
-
test 'map edit user registration' do
|
79
|
-
assert_recognizes({controller: 'devise/registrations', action: 'edit'}, {path: 'users/edit', method: :get})
|
80
|
-
assert_named_route "/users/edit", :edit_user_registration_path
|
81
|
-
end
|
82
|
-
|
83
|
-
test 'map update user registration' do
|
84
|
-
assert_recognizes({controller: 'devise/registrations', action: 'update'}, {path: 'users', method: :put})
|
85
|
-
end
|
86
|
-
|
87
|
-
test 'map destroy user registration' do
|
88
|
-
assert_recognizes({controller: 'devise/registrations', action: 'destroy'}, {path: 'users', method: :delete})
|
89
|
-
end
|
90
|
-
|
91
|
-
test 'map cancel user registration' do
|
92
|
-
assert_recognizes({controller: 'devise/registrations', action: 'cancel'}, {path: 'users/cancel', method: :get})
|
93
|
-
assert_named_route "/users/cancel", :cancel_user_registration_path
|
94
|
-
end
|
95
|
-
|
96
|
-
test 'map omniauth callbacks' do
|
97
|
-
assert_recognizes({controller: 'users/omniauth_callbacks', action: 'facebook'}, {path: 'users/auth/facebook/callback', method: :get})
|
98
|
-
assert_recognizes({controller: 'users/omniauth_callbacks', action: 'facebook'}, {path: 'users/auth/facebook/callback', method: :post})
|
99
|
-
assert_named_route "/users/auth/facebook/callback", :user_facebook_omniauth_callback_path
|
100
|
-
|
101
|
-
# named open_id
|
102
|
-
assert_recognizes({controller: 'users/omniauth_callbacks', action: 'google'}, {path: 'users/auth/google/callback', method: :get})
|
103
|
-
assert_recognizes({controller: 'users/omniauth_callbacks', action: 'google'}, {path: 'users/auth/google/callback', method: :post})
|
104
|
-
assert_named_route "/users/auth/google/callback", :user_google_omniauth_callback_path
|
105
|
-
|
106
|
-
assert_raise ExpectedRoutingError do
|
107
|
-
assert_recognizes({controller: 'ysers/omniauth_callbacks', action: 'twitter'}, {path: 'users/auth/twitter/callback', method: :get})
|
108
|
-
end
|
109
|
-
end
|
110
|
-
|
111
|
-
protected
|
112
|
-
|
113
|
-
def assert_named_route(result, *args)
|
114
|
-
assert_equal result, @routes.url_helpers.send(*args)
|
115
|
-
end
|
116
|
-
end
|
117
|
-
|
118
|
-
class CustomizedRoutingTest < ActionController::TestCase
|
119
|
-
test 'map admin with :path option' do
|
120
|
-
assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'admin_area/sign_up', method: :get})
|
121
|
-
end
|
122
|
-
|
123
|
-
test 'map admin with :controllers option' do
|
124
|
-
assert_recognizes({controller: 'admins/sessions', action: 'new'}, {path: 'admin_area/sign_in', method: :get})
|
125
|
-
end
|
126
|
-
|
127
|
-
test 'does not map admin password' do
|
128
|
-
assert_raise ExpectedRoutingError do
|
129
|
-
assert_recognizes({controller: 'devise/passwords', action: 'new'}, 'admin_area/password/new')
|
130
|
-
end
|
131
|
-
end
|
132
|
-
|
133
|
-
test 'subdomain admin' do
|
134
|
-
assert_recognizes({"host"=>"sub.example.com", controller: 'devise/sessions', action: 'new'}, {host: "sub.example.com", path: '/sub_admin/sign_in', method: :get})
|
135
|
-
end
|
136
|
-
|
137
|
-
test 'does only map reader password' do
|
138
|
-
assert_raise ExpectedRoutingError do
|
139
|
-
assert_recognizes({controller: 'devise/sessions', action: 'new'}, 'reader/sessions/new')
|
140
|
-
end
|
141
|
-
assert_recognizes({controller: 'devise/passwords', action: 'new'}, 'reader/password/new')
|
142
|
-
end
|
143
|
-
|
144
|
-
test 'map account with custom path name for session sign in' do
|
145
|
-
assert_recognizes({controller: 'devise/sessions', action: 'new', locale: 'en'}, '/en/accounts/login')
|
146
|
-
end
|
147
|
-
|
148
|
-
test 'map account with custom path name for session sign out' do
|
149
|
-
assert_recognizes({controller: 'devise/sessions', action: 'destroy', locale: 'en'}, {path: '/en/accounts/logout', method: :delete })
|
150
|
-
end
|
151
|
-
|
152
|
-
test 'map account with custom path name for password' do
|
153
|
-
assert_recognizes({controller: 'devise/passwords', action: 'new', locale: 'en'}, '/en/accounts/secret/new')
|
154
|
-
end
|
155
|
-
|
156
|
-
test 'map account with custom path name for registration' do
|
157
|
-
assert_recognizes({controller: 'devise/registrations', action: 'new', locale: 'en'}, '/en/accounts/management/register')
|
158
|
-
end
|
159
|
-
|
160
|
-
test 'map account with custom path name for edit registration' do
|
161
|
-
assert_recognizes({controller: 'devise/registrations', action: 'edit', locale: 'en'}, '/en/accounts/management/edit/profile')
|
162
|
-
end
|
163
|
-
|
164
|
-
test 'map account with custom path name for cancel registration' do
|
165
|
-
assert_recognizes({controller: 'devise/registrations', action: 'cancel', locale: 'en'}, '/en/accounts/management/giveup')
|
166
|
-
end
|
167
|
-
|
168
|
-
test 'map deletes with :sign_out_via option' do
|
169
|
-
assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/deletes/sign_out', method: :delete})
|
170
|
-
assert_raise ExpectedRoutingError do
|
171
|
-
assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/deletes/sign_out', method: :get})
|
172
|
-
end
|
173
|
-
end
|
174
|
-
|
175
|
-
test 'map posts with :sign_out_via option' do
|
176
|
-
assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/posts/sign_out', method: :post})
|
177
|
-
assert_raise ExpectedRoutingError do
|
178
|
-
assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/posts/sign_out', method: :get})
|
179
|
-
end
|
180
|
-
end
|
181
|
-
|
182
|
-
test 'map delete_or_posts with :sign_out_via option' do
|
183
|
-
assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/delete_or_posts/sign_out', method: :post})
|
184
|
-
assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/delete_or_posts/sign_out', method: :delete})
|
185
|
-
assert_raise ExpectedRoutingError do
|
186
|
-
assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/delete_or_posts/sign_out', method: :get})
|
187
|
-
end
|
188
|
-
end
|
189
|
-
|
190
|
-
test 'map with constraints defined in hash' do
|
191
|
-
assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://192.168.1.100/headquarters/sign_up', method: :get})
|
192
|
-
assert_raise ExpectedRoutingError do
|
193
|
-
assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://10.0.0.100/headquarters/sign_up', method: :get})
|
194
|
-
end
|
195
|
-
end
|
196
|
-
|
197
|
-
test 'map with constraints defined in block' do
|
198
|
-
assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://192.168.1.100/homebase/sign_up', method: :get})
|
199
|
-
assert_raise ExpectedRoutingError do
|
200
|
-
assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://10.0.0.100//homebase/sign_up', method: :get})
|
201
|
-
end
|
202
|
-
end
|
203
|
-
|
204
|
-
test 'map with format false for sessions' do
|
205
|
-
expected_params = {controller: 'devise/sessions', action: 'new'}
|
206
|
-
expected_params[:format] = false if Devise.rails5?
|
207
|
-
|
208
|
-
assert_recognizes(expected_params, {path: '/htmlonly_admin/sign_in', method: :get})
|
209
|
-
assert_raise ExpectedRoutingError do
|
210
|
-
assert_recognizes(expected_params, {path: '/htmlonly_admin/sign_in.xml', method: :get})
|
211
|
-
end
|
212
|
-
end
|
213
|
-
|
214
|
-
test 'map with format false for passwords' do
|
215
|
-
expected_params = {controller: 'devise/passwords', action: 'create'}
|
216
|
-
expected_params[:format] = false if Devise.rails5?
|
217
|
-
|
218
|
-
assert_recognizes(expected_params, {path: '/htmlonly_admin/password', method: :post})
|
219
|
-
assert_raise ExpectedRoutingError do
|
220
|
-
assert_recognizes(expected_params, {path: '/htmlonly_admin/password.xml', method: :post})
|
221
|
-
end
|
222
|
-
end
|
223
|
-
|
224
|
-
test 'map with format false for registrations' do
|
225
|
-
expected_params = {controller: 'devise/registrations', action: 'new'}
|
226
|
-
expected_params[:format] = false if Devise.rails5?
|
227
|
-
|
228
|
-
assert_recognizes(expected_params, {path: '/htmlonly_admin/sign_up', method: :get})
|
229
|
-
assert_raise ExpectedRoutingError do
|
230
|
-
assert_recognizes(expected_params, {path: '/htmlonly_admin/sign_up.xml', method: :get})
|
231
|
-
end
|
232
|
-
end
|
233
|
-
|
234
|
-
test 'map with format false for confirmations' do
|
235
|
-
expected_params = {controller: 'devise/confirmations', action: 'show'}
|
236
|
-
expected_params[:format] = false if Devise.rails5?
|
237
|
-
|
238
|
-
assert_recognizes(expected_params, {path: '/htmlonly_users/confirmation', method: :get})
|
239
|
-
assert_raise ExpectedRoutingError do
|
240
|
-
assert_recognizes(expected_params, {path: '/htmlonly_users/confirmation.xml', method: :get})
|
241
|
-
end
|
242
|
-
end
|
243
|
-
|
244
|
-
test 'map with format false for unlocks' do
|
245
|
-
expected_params = {controller: 'devise/unlocks', action: 'show'}
|
246
|
-
expected_params[:format] = false if Devise.rails5?
|
247
|
-
|
248
|
-
assert_recognizes(expected_params, {path: '/htmlonly_users/unlock', method: :get})
|
249
|
-
assert_raise ExpectedRoutingError do
|
250
|
-
assert_recognizes(expected_params, {path: '/htmlonly_users/unlock.xml', method: :get})
|
251
|
-
end
|
252
|
-
end
|
253
|
-
|
254
|
-
test 'map with format false is not permanent' do
|
255
|
-
assert_equal "/set.xml", @routes.url_helpers.set_path(:xml)
|
256
|
-
end
|
257
|
-
|
258
|
-
test 'checks if mapping has proper configuration for omniauth callback' do
|
259
|
-
e = assert_raise ArgumentError do
|
260
|
-
routes = ActionDispatch::Routing::RouteSet.new
|
261
|
-
routes.draw do
|
262
|
-
devise_for :not_omniauthable, class_name: 'Admin', controllers: {omniauth_callbacks: "users/omniauth_callbacks"}
|
263
|
-
end
|
264
|
-
end
|
265
|
-
assert_match "Mapping omniauth_callbacks on a resource that is not omniauthable", e.message
|
266
|
-
end
|
267
|
-
end
|
268
|
-
|
269
|
-
class ScopedRoutingTest < ActionController::TestCase
|
270
|
-
test 'map publisher account' do
|
271
|
-
assert_recognizes({controller: 'publisher/registrations', action: 'new'}, {path: '/publisher/accounts/sign_up', method: :get})
|
272
|
-
assert_equal '/publisher/accounts/sign_up', @routes.url_helpers.new_publisher_account_registration_path
|
273
|
-
end
|
274
|
-
|
275
|
-
test 'map publisher account merges path names' do
|
276
|
-
assert_recognizes({controller: 'publisher/sessions', action: 'new'}, {path: '/publisher/accounts/get_in', method: :get})
|
277
|
-
assert_equal '/publisher/accounts/get_in', @routes.url_helpers.new_publisher_account_session_path
|
278
|
-
end
|
279
|
-
end
|