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
@@ -1,10 +0,0 @@
|
|
1
|
-
# Since webrat uses ActionController::RecordIdentifier class that was moved to
|
2
|
-
# ActionView namespace in Rails 4.1+
|
3
|
-
|
4
|
-
unless defined?(ActionController::RecordIdentifier)
|
5
|
-
require 'action_view/record_identifier'
|
6
|
-
|
7
|
-
module ActionController
|
8
|
-
RecordIdentifier = ActionView::RecordIdentifier
|
9
|
-
end
|
10
|
-
end
|
data/test/support/assertions.rb
DELETED
@@ -1,39 +0,0 @@
|
|
1
|
-
require 'active_support/test_case'
|
2
|
-
|
3
|
-
class ActiveSupport::TestCase
|
4
|
-
def assert_not(assertion)
|
5
|
-
assert !assertion
|
6
|
-
end
|
7
|
-
|
8
|
-
def assert_blank(assertion)
|
9
|
-
assert assertion.blank?
|
10
|
-
end
|
11
|
-
|
12
|
-
def assert_present(assertion)
|
13
|
-
assert assertion.present?
|
14
|
-
end
|
15
|
-
|
16
|
-
def assert_email_sent(address = nil, &block)
|
17
|
-
assert_difference('ActionMailer::Base.deliveries.size', &block)
|
18
|
-
if address.present?
|
19
|
-
assert_equal address, ActionMailer::Base.deliveries.last['to'].to_s
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
def assert_email_not_sent(&block)
|
24
|
-
assert_no_difference('ActionMailer::Base.deliveries.size', &block)
|
25
|
-
end
|
26
|
-
|
27
|
-
def assert_same_content(result, expected)
|
28
|
-
assert expected.size == result.size, "the arrays doesn't have the same size"
|
29
|
-
expected.each do |element|
|
30
|
-
assert result.include?(element), "The array doesn't include '#{element}'."
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
def assert_raise_with_message(exception_klass, message, &block)
|
35
|
-
exception = assert_raise exception_klass, &block
|
36
|
-
assert_equal exception.message, message,
|
37
|
-
"The expected message was #{message} but your exception throwed #{exception.message}"
|
38
|
-
end
|
39
|
-
end
|
data/test/support/helpers.rb
DELETED
@@ -1,77 +0,0 @@
|
|
1
|
-
require 'active_support/test_case'
|
2
|
-
|
3
|
-
class ActiveSupport::TestCase
|
4
|
-
VALID_AUTHENTICATION_TOKEN = 'AbCdEfGhIjKlMnOpQrSt'.freeze
|
5
|
-
|
6
|
-
def setup_mailer
|
7
|
-
ActionMailer::Base.deliveries = []
|
8
|
-
end
|
9
|
-
|
10
|
-
def store_translations(locale, translations, &block)
|
11
|
-
# Calling 'available_locales' before storing the translations to ensure
|
12
|
-
# that the I18n backend will be initialized before we store our custom
|
13
|
-
# translations, so they will always override the translations for the
|
14
|
-
# YML file.
|
15
|
-
I18n.available_locales
|
16
|
-
I18n.backend.store_translations(locale, translations)
|
17
|
-
yield
|
18
|
-
ensure
|
19
|
-
I18n.reload!
|
20
|
-
end
|
21
|
-
|
22
|
-
def generate_unique_email
|
23
|
-
@@email_count ||= 0
|
24
|
-
@@email_count += 1
|
25
|
-
"test#{@@email_count}@example.com"
|
26
|
-
end
|
27
|
-
|
28
|
-
def valid_attributes(attributes={})
|
29
|
-
{ username: "usertest",
|
30
|
-
email: generate_unique_email,
|
31
|
-
password: '12345678',
|
32
|
-
password_confirmation: '12345678' }.update(attributes)
|
33
|
-
end
|
34
|
-
|
35
|
-
def new_user(attributes={})
|
36
|
-
User.new(valid_attributes(attributes))
|
37
|
-
end
|
38
|
-
|
39
|
-
def create_user(attributes={})
|
40
|
-
User.create!(valid_attributes(attributes))
|
41
|
-
end
|
42
|
-
|
43
|
-
def create_admin(attributes={})
|
44
|
-
valid_attributes = valid_attributes(attributes)
|
45
|
-
valid_attributes.delete(:username)
|
46
|
-
Admin.create!(valid_attributes)
|
47
|
-
end
|
48
|
-
|
49
|
-
def create_user_without_email(attributes={})
|
50
|
-
UserWithoutEmail.create!(valid_attributes(attributes))
|
51
|
-
end
|
52
|
-
|
53
|
-
# Execute the block setting the given values and restoring old values after
|
54
|
-
# the block is executed.
|
55
|
-
def swap(object, new_values)
|
56
|
-
old_values = {}
|
57
|
-
new_values.each do |key, value|
|
58
|
-
old_values[key] = object.send key
|
59
|
-
object.send :"#{key}=", value
|
60
|
-
end
|
61
|
-
clear_cached_variables(new_values)
|
62
|
-
yield
|
63
|
-
ensure
|
64
|
-
clear_cached_variables(new_values)
|
65
|
-
old_values.each do |key, value|
|
66
|
-
object.send :"#{key}=", value
|
67
|
-
end
|
68
|
-
end
|
69
|
-
|
70
|
-
def clear_cached_variables(options)
|
71
|
-
if options.key?(:case_insensitive_keys) || options.key?(:strip_whitespace_keys)
|
72
|
-
Devise.mappings.each do |_, mapping|
|
73
|
-
mapping.to.instance_variable_set(:@devise_parameter_filter, nil)
|
74
|
-
end
|
75
|
-
end
|
76
|
-
end
|
77
|
-
end
|
@@ -1,51 +0,0 @@
|
|
1
|
-
module Devise
|
2
|
-
class IntegrationTest < ActionDispatch::IntegrationTest
|
3
|
-
# %w( get post patch put head delete xml_http_request
|
4
|
-
# xhr get_via_redirect post_via_redirect
|
5
|
-
# ).each do |method|
|
6
|
-
%w( get post put ).each do |method|
|
7
|
-
if Rails.version >= '5.0.0'
|
8
|
-
define_method(method) do |url, options={}|
|
9
|
-
if options.empty?
|
10
|
-
super url
|
11
|
-
else
|
12
|
-
super url, options
|
13
|
-
end
|
14
|
-
end
|
15
|
-
else
|
16
|
-
define_method(method) do |url, options={}|
|
17
|
-
if options[:xhr]==true
|
18
|
-
xml_http_request __method__, url, options[:params] || {}, options[:headers]
|
19
|
-
else
|
20
|
-
super url, options[:params] || {}, options[:headers]
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
26
|
-
|
27
|
-
class ControllerTestCase < ActionController::TestCase
|
28
|
-
# %w( get post patch put head delete xml_http_request
|
29
|
-
# xhr get_via_redirect post_via_redirect
|
30
|
-
# ).each do |method|
|
31
|
-
%w( get post put ).each do |method|
|
32
|
-
if Rails.version >= '5.0.0'
|
33
|
-
define_method(method) do |action, options={}|
|
34
|
-
if options.empty?
|
35
|
-
super action
|
36
|
-
else
|
37
|
-
super action, options
|
38
|
-
end
|
39
|
-
end
|
40
|
-
else
|
41
|
-
define_method(method) do |action, options={}|
|
42
|
-
if options[:xhr]==true
|
43
|
-
xml_http_request __method__, action, options[:params] || {}, options[:headers]
|
44
|
-
else
|
45
|
-
super action, options[:params] || {}, options[:headers]
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
51
|
-
end
|
data/test/support/integration.rb
DELETED
@@ -1,92 +0,0 @@
|
|
1
|
-
require 'action_dispatch/testing/integration'
|
2
|
-
|
3
|
-
class ActionDispatch::IntegrationTest
|
4
|
-
def warden
|
5
|
-
request.env['warden']
|
6
|
-
end
|
7
|
-
|
8
|
-
def create_user(options={})
|
9
|
-
@user ||= begin
|
10
|
-
user = User.create!(
|
11
|
-
username: 'usertest',
|
12
|
-
email: options[:email] || 'user@test.com',
|
13
|
-
password: options[:password] || '12345678',
|
14
|
-
password_confirmation: options[:password] || '12345678',
|
15
|
-
created_at: Time.now.utc
|
16
|
-
)
|
17
|
-
user.update_attribute(:confirmation_sent_at, options[:confirmation_sent_at]) if options[:confirmation_sent_at]
|
18
|
-
user.confirm unless options[:confirm] == false
|
19
|
-
user.lock_access! if options[:locked] == true
|
20
|
-
user
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
def create_admin(options={})
|
25
|
-
@admin ||= begin
|
26
|
-
admin = Admin.create!(
|
27
|
-
email: options[:email] || 'admin@test.com',
|
28
|
-
password: '123456', password_confirmation: '123456',
|
29
|
-
active: options[:active]
|
30
|
-
)
|
31
|
-
admin.confirm unless options[:confirm] == false
|
32
|
-
admin
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
def sign_in_as_user(options={}, &block)
|
37
|
-
user = create_user(options)
|
38
|
-
visit_with_option options[:visit], new_user_session_path
|
39
|
-
fill_in 'email', with: options[:email] || 'user@test.com'
|
40
|
-
fill_in 'password', with: options[:password] || '12345678'
|
41
|
-
check 'remember me' if options[:remember_me] == true
|
42
|
-
yield if block_given?
|
43
|
-
click_button 'Log In'
|
44
|
-
user
|
45
|
-
end
|
46
|
-
|
47
|
-
def sign_in_as_admin(options={}, &block)
|
48
|
-
admin = create_admin(options)
|
49
|
-
visit_with_option options[:visit], new_admin_session_path
|
50
|
-
fill_in 'email', with: 'admin@test.com'
|
51
|
-
fill_in 'password', with: '123456'
|
52
|
-
yield if block_given?
|
53
|
-
click_button 'Log In'
|
54
|
-
admin
|
55
|
-
end
|
56
|
-
|
57
|
-
# Fix assert_redirect_to in integration sessions because they don't take into
|
58
|
-
# account Middleware redirects.
|
59
|
-
#
|
60
|
-
def assert_redirected_to(url)
|
61
|
-
assert [301, 302].include?(@integration_session.status),
|
62
|
-
"Expected status to be 301 or 302, got #{@integration_session.status}"
|
63
|
-
|
64
|
-
assert_url url, @integration_session.headers["Location"]
|
65
|
-
end
|
66
|
-
|
67
|
-
def assert_current_url(expected)
|
68
|
-
assert_url expected, current_url
|
69
|
-
end
|
70
|
-
|
71
|
-
def assert_url(expected, actual)
|
72
|
-
assert_equal prepend_host(expected), prepend_host(actual)
|
73
|
-
end
|
74
|
-
|
75
|
-
protected
|
76
|
-
|
77
|
-
def visit_with_option(given, default)
|
78
|
-
case given
|
79
|
-
when String
|
80
|
-
visit given
|
81
|
-
when FalseClass
|
82
|
-
# Do nothing
|
83
|
-
else
|
84
|
-
visit default
|
85
|
-
end
|
86
|
-
end
|
87
|
-
|
88
|
-
def prepend_host(url)
|
89
|
-
url = "http://#{request.host}#{url}" if url[0] == ?/
|
90
|
-
url
|
91
|
-
end
|
92
|
-
end
|
data/test/support/locale/en.yml
DELETED
data/test/support/mongoid.yml
DELETED
@@ -1,33 +0,0 @@
|
|
1
|
-
require 'webrat/core/elements/form'
|
2
|
-
require 'action_dispatch/testing/integration'
|
3
|
-
|
4
|
-
module Webrat
|
5
|
-
Form.class_eval do
|
6
|
-
def self.parse_rails_request_params(params)
|
7
|
-
Rack::Utils.parse_nested_query(params)
|
8
|
-
end
|
9
|
-
end
|
10
|
-
|
11
|
-
module Logging
|
12
|
-
# Avoid RAILS_DEFAULT_LOGGER deprecation warning
|
13
|
-
def logger # :nodoc:
|
14
|
-
::Rails.logger
|
15
|
-
end
|
16
|
-
end
|
17
|
-
|
18
|
-
class RailsAdapter
|
19
|
-
protected
|
20
|
-
|
21
|
-
def do_request(http_method, url, data, headers)
|
22
|
-
update_protocol(url)
|
23
|
-
integration_session.send(http_method, normalize_url(url), params: data, headers: headers)
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
module ActionDispatch #:nodoc:
|
29
|
-
IntegrationTest.class_eval do
|
30
|
-
include Webrat::Methods
|
31
|
-
include Webrat::Matchers
|
32
|
-
end
|
33
|
-
end
|
data/test/test_helper.rb
DELETED
@@ -1,34 +0,0 @@
|
|
1
|
-
ENV["RAILS_ENV"] = "test"
|
2
|
-
DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
|
3
|
-
|
4
|
-
$:.unshift File.dirname(__FILE__)
|
5
|
-
puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
|
6
|
-
|
7
|
-
require "rails_app/config/environment"
|
8
|
-
require "rails/test_help"
|
9
|
-
require "orm/#{DEVISE_ORM}"
|
10
|
-
|
11
|
-
I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__)
|
12
|
-
|
13
|
-
require 'mocha/setup'
|
14
|
-
require 'webrat'
|
15
|
-
Webrat.configure do |config|
|
16
|
-
config.mode = :rails
|
17
|
-
config.open_error_files = false
|
18
|
-
end
|
19
|
-
|
20
|
-
if ActiveSupport.respond_to?(:test_order)
|
21
|
-
ActiveSupport.test_order = :random
|
22
|
-
end
|
23
|
-
|
24
|
-
OmniAuth.config.logger = Logger.new('/dev/null')
|
25
|
-
|
26
|
-
# Add support to load paths so we can overwrite broken webrat setup
|
27
|
-
$:.unshift File.expand_path('../support', __FILE__)
|
28
|
-
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
|
29
|
-
|
30
|
-
# For generators
|
31
|
-
require "rails/generators/test_case"
|
32
|
-
require "generators/devise/install_generator"
|
33
|
-
require "generators/devise/views_generator"
|
34
|
-
require "generators/devise/controllers_generator"
|
data/test/test_helpers_test.rb
DELETED
@@ -1,178 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
|
3
|
-
class TestHelpersTest < Devise::ControllerTestCase
|
4
|
-
tests UsersController
|
5
|
-
include Devise::TestHelpers
|
6
|
-
|
7
|
-
test "redirects if attempting to access a page unauthenticated" do
|
8
|
-
get :index
|
9
|
-
assert_redirected_to new_user_session_path
|
10
|
-
assert_equal "You need to sign in or sign up before continuing.", flash[:alert]
|
11
|
-
end
|
12
|
-
|
13
|
-
test "redirects if attempting to access a page with an unconfirmed account" do
|
14
|
-
swap Devise, allow_unconfirmed_access_for: 0.days do
|
15
|
-
user = create_user
|
16
|
-
assert !user.active_for_authentication?
|
17
|
-
|
18
|
-
sign_in user
|
19
|
-
get :index
|
20
|
-
assert_redirected_to new_user_session_path
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
test "returns nil if accessing current_user with an unconfirmed account" do
|
25
|
-
swap Devise, allow_unconfirmed_access_for: 0.days do
|
26
|
-
user = create_user
|
27
|
-
assert !user.active_for_authentication?
|
28
|
-
|
29
|
-
sign_in user
|
30
|
-
get :accept, params: { id: user }
|
31
|
-
assert_nil assigns(:current_user)
|
32
|
-
end
|
33
|
-
end
|
34
|
-
|
35
|
-
test "does not redirect with valid user" do
|
36
|
-
user = create_user
|
37
|
-
user.confirm
|
38
|
-
|
39
|
-
sign_in user
|
40
|
-
get :index
|
41
|
-
assert_response :success
|
42
|
-
end
|
43
|
-
|
44
|
-
test "does not redirect with valid user after failed first attempt" do
|
45
|
-
get :index
|
46
|
-
assert_response :redirect
|
47
|
-
|
48
|
-
user = create_user
|
49
|
-
user.confirm
|
50
|
-
|
51
|
-
sign_in user
|
52
|
-
get :index
|
53
|
-
assert_response :success
|
54
|
-
end
|
55
|
-
|
56
|
-
test "redirects if valid user signed out" do
|
57
|
-
user = create_user
|
58
|
-
user.confirm
|
59
|
-
|
60
|
-
sign_in user
|
61
|
-
get :index
|
62
|
-
|
63
|
-
sign_out user
|
64
|
-
get :index
|
65
|
-
assert_redirected_to new_user_session_path
|
66
|
-
end
|
67
|
-
|
68
|
-
test "respects custom failure app" do
|
69
|
-
custom_failure_app = Class.new(Devise::FailureApp) do
|
70
|
-
def redirect
|
71
|
-
self.status = 300
|
72
|
-
end
|
73
|
-
end
|
74
|
-
|
75
|
-
swap Devise.warden_config, failure_app: custom_failure_app do
|
76
|
-
get :index
|
77
|
-
assert_response 300
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
test "passes given headers from the failure app to the response" do
|
82
|
-
custom_failure_app = Class.new(Devise::FailureApp) do
|
83
|
-
def respond
|
84
|
-
self.status = 401
|
85
|
-
self.response.headers["CUSTOMHEADER"] = 1
|
86
|
-
end
|
87
|
-
end
|
88
|
-
|
89
|
-
swap Devise.warden_config, failure_app: custom_failure_app do
|
90
|
-
sign_in create_user
|
91
|
-
get :index
|
92
|
-
assert_equal 1, @response.headers["CUSTOMHEADER"]
|
93
|
-
end
|
94
|
-
end
|
95
|
-
|
96
|
-
test "returns the body of a failure app" do
|
97
|
-
get :index
|
98
|
-
assert_equal response.body, "<html><body>You are being <a href=\"http://test.host/users/sign_in\">redirected</a>.</body></html>"
|
99
|
-
end
|
100
|
-
|
101
|
-
test "defined Warden after_authentication callback should not be called when sign_in is called" do
|
102
|
-
begin
|
103
|
-
Warden::Manager.after_authentication do |user, auth, opts|
|
104
|
-
flunk "callback was called while it should not"
|
105
|
-
end
|
106
|
-
|
107
|
-
user = create_user
|
108
|
-
user.confirm
|
109
|
-
sign_in user
|
110
|
-
ensure
|
111
|
-
Warden::Manager._after_set_user.pop
|
112
|
-
end
|
113
|
-
end
|
114
|
-
|
115
|
-
test "defined Warden before_logout callback should not be called when sign_out is called" do
|
116
|
-
begin
|
117
|
-
Warden::Manager.before_logout do |user, auth, opts|
|
118
|
-
flunk "callback was called while it should not"
|
119
|
-
end
|
120
|
-
user = create_user
|
121
|
-
user.confirm
|
122
|
-
|
123
|
-
sign_in user
|
124
|
-
sign_out user
|
125
|
-
ensure
|
126
|
-
Warden::Manager._before_logout.pop
|
127
|
-
end
|
128
|
-
end
|
129
|
-
|
130
|
-
test "before_failure call should work" do
|
131
|
-
begin
|
132
|
-
executed = false
|
133
|
-
Warden::Manager.before_failure do |env,opts|
|
134
|
-
executed = true
|
135
|
-
end
|
136
|
-
|
137
|
-
user = create_user
|
138
|
-
sign_in user
|
139
|
-
|
140
|
-
get :index
|
141
|
-
assert executed
|
142
|
-
ensure
|
143
|
-
Warden::Manager._before_failure.pop
|
144
|
-
end
|
145
|
-
end
|
146
|
-
|
147
|
-
test "allows to sign in with different users" do
|
148
|
-
first_user = create_user
|
149
|
-
first_user.confirm
|
150
|
-
|
151
|
-
sign_in first_user
|
152
|
-
get :index
|
153
|
-
assert_match /User ##{first_user.id}/, @response.body
|
154
|
-
sign_out first_user
|
155
|
-
|
156
|
-
second_user = create_user
|
157
|
-
second_user.confirm
|
158
|
-
|
159
|
-
sign_in second_user
|
160
|
-
get :index
|
161
|
-
assert_match /User ##{second_user.id}/, @response.body
|
162
|
-
end
|
163
|
-
|
164
|
-
test "creates a new warden proxy if the request object has changed" do
|
165
|
-
old_warden_proxy = warden
|
166
|
-
@request = Devise.rails5? ? ActionController::TestRequest.create : ActionController::TestRequest.new
|
167
|
-
new_warden_proxy = warden
|
168
|
-
|
169
|
-
assert_not_equal old_warden_proxy, new_warden_proxy
|
170
|
-
end
|
171
|
-
|
172
|
-
test "doesn't create a new warden proxy if the request object hasn't changed" do
|
173
|
-
old_warden_proxy = warden
|
174
|
-
new_warden_proxy = warden
|
175
|
-
|
176
|
-
assert_equal old_warden_proxy, new_warden_proxy
|
177
|
-
end
|
178
|
-
end
|