devise 3.0.0 → 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.
- checksums.yaml +7 -0
- data/CHANGELOG.md +351 -0
- data/MIT-LICENSE +2 -1
- data/README.md +422 -130
- data/app/controllers/devise/confirmations_controller.rb +17 -6
- data/app/controllers/devise/omniauth_callbacks_controller.rb +12 -6
- data/app/controllers/devise/passwords_controller.rb +23 -8
- data/app/controllers/devise/registrations_controller.rb +70 -28
- data/app/controllers/devise/sessions_controller.rb +49 -17
- data/app/controllers/devise/unlocks_controller.rb +11 -4
- data/app/controllers/devise_controller.rb +74 -34
- data/app/helpers/devise_helper.rb +23 -18
- data/app/mailers/devise/mailer.rb +25 -10
- data/app/views/devise/confirmations/new.html.erb +9 -5
- data/app/views/devise/mailer/confirmation_instructions.html.erb +1 -1
- data/app/views/devise/mailer/email_changed.html.erb +7 -0
- data/app/views/devise/mailer/password_change.html.erb +3 -0
- data/app/views/devise/mailer/reset_password_instructions.html.erb +1 -1
- data/app/views/devise/mailer/unlock_instructions.html.erb +1 -1
- data/app/views/devise/passwords/edit.html.erb +16 -7
- data/app/views/devise/passwords/new.html.erb +9 -5
- data/app/views/devise/registrations/edit.html.erb +29 -15
- data/app/views/devise/registrations/new.html.erb +20 -9
- data/app/views/devise/sessions/new.html.erb +19 -10
- data/app/views/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/devise/shared/{_links.erb → _links.html.erb} +10 -10
- data/app/views/devise/unlocks/new.html.erb +9 -5
- data/config/locales/en.yml +26 -20
- data/lib/devise/controllers/helpers.rb +122 -125
- data/lib/devise/controllers/rememberable.rb +14 -14
- data/lib/devise/controllers/scoped_views.rb +3 -1
- data/lib/devise/controllers/sign_in_out.rb +121 -0
- data/lib/devise/controllers/store_location.rb +76 -0
- data/lib/devise/controllers/url_helpers.rb +10 -8
- data/lib/devise/delegator.rb +2 -0
- data/lib/devise/encryptor.rb +24 -0
- data/lib/devise/failure_app.rb +132 -42
- data/lib/devise/hooks/activatable.rb +7 -6
- data/lib/devise/hooks/csrf_cleaner.rb +9 -0
- data/lib/devise/hooks/forgetable.rb +3 -1
- data/lib/devise/hooks/lockable.rb +5 -3
- data/lib/devise/hooks/proxy.rb +23 -0
- data/lib/devise/hooks/rememberable.rb +7 -4
- data/lib/devise/hooks/timeoutable.rb +18 -8
- data/lib/devise/hooks/trackable.rb +3 -1
- data/lib/devise/mailers/helpers.rb +15 -18
- data/lib/devise/mapping.rb +9 -3
- data/lib/devise/models/authenticatable.rb +102 -80
- data/lib/devise/models/confirmable.rb +154 -72
- data/lib/devise/models/database_authenticatable.rb +125 -25
- data/lib/devise/models/lockable.rb +50 -29
- data/lib/devise/models/omniauthable.rb +3 -1
- data/lib/devise/models/recoverable.rb +72 -50
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +65 -32
- data/lib/devise/models/timeoutable.rb +4 -8
- data/lib/devise/models/trackable.rb +20 -4
- data/lib/devise/models/validatable.rb +16 -9
- data/lib/devise/models.rb +6 -13
- data/lib/devise/modules.rb +12 -11
- data/lib/devise/omniauth/config.rb +2 -0
- data/lib/devise/omniauth/url_helpers.rb +14 -5
- data/lib/devise/omniauth.rb +4 -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 +144 -34
- data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
- data/lib/devise/rails/routes.rb +191 -127
- data/lib/devise/rails/warden_compat.rb +2 -1
- data/lib/devise/rails.rb +13 -20
- data/lib/devise/secret_key_finder.rb +27 -0
- data/lib/devise/strategies/authenticatable.rb +21 -22
- data/lib/devise/strategies/base.rb +3 -1
- data/lib/devise/strategies/database_authenticatable.rb +15 -4
- data/lib/devise/strategies/rememberable.rb +15 -3
- 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 -123
- data/lib/devise/time_inflector.rb +4 -2
- data/lib/devise/token_generator.rb +32 -0
- data/lib/devise/version.rb +3 -1
- data/lib/devise.rb +124 -78
- data/lib/generators/active_record/devise_generator.rb +64 -15
- data/lib/generators/active_record/templates/migration.rb +9 -8
- data/lib/generators/active_record/templates/migration_existing.rb +9 -8
- data/lib/generators/devise/controllers_generator.rb +46 -0
- data/lib/generators/devise/devise_generator.rb +10 -6
- data/lib/generators/devise/install_generator.rb +19 -1
- data/lib/generators/devise/orm_helpers.rb +17 -9
- data/lib/generators/devise/views_generator.rb +51 -28
- data/lib/generators/mongoid/devise_generator.rb +24 -24
- data/lib/generators/templates/README +13 -12
- data/lib/generators/templates/controllers/README +14 -0
- data/lib/generators/templates/controllers/confirmations_controller.rb +30 -0
- data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +30 -0
- data/lib/generators/templates/controllers/passwords_controller.rb +34 -0
- data/lib/generators/templates/controllers/registrations_controller.rb +62 -0
- data/lib/generators/templates/controllers/sessions_controller.rb +27 -0
- data/lib/generators/templates/controllers/unlocks_controller.rb +30 -0
- data/lib/generators/templates/devise.rb +118 -53
- data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/email_changed.markerb +7 -0
- data/lib/generators/templates/markerb/password_change.markerb +3 -0
- data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
- data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +6 -2
- data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +12 -4
- data/lib/generators/templates/simple_form_for/passwords/new.html.erb +5 -2
- data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +14 -6
- data/lib/generators/templates/simple_form_for/registrations/new.html.erb +12 -4
- data/lib/generators/templates/simple_form_for/sessions/new.html.erb +11 -6
- data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +5 -2
- metadata +73 -294
- data/.gitignore +0 -10
- data/.travis.yml +0 -20
- data/.yardopts +0 -9
- data/CHANGELOG.rdoc +0 -941
- data/CONTRIBUTING.md +0 -14
- data/Gemfile +0 -31
- data/Gemfile.lock +0 -159
- data/Rakefile +0 -35
- data/app/views/devise/_links.erb +0 -3
- data/devise.gemspec +0 -26
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-3.2.x +0 -31
- data/gemfiles/Gemfile.rails-3.2.x.lock +0 -156
- data/lib/devise/models/token_authenticatable.rb +0 -89
- data/lib/devise/strategies/token_authenticatable.rb +0 -91
- data/test/controllers/custom_strategy_test.rb +0 -62
- data/test/controllers/helpers_test.rb +0 -253
- data/test/controllers/internal_helpers_test.rb +0 -120
- data/test/controllers/passwords_controller_test.rb +0 -32
- data/test/controllers/sessions_controller_test.rb +0 -99
- data/test/controllers/url_helpers_test.rb +0 -59
- data/test/delegator_test.rb +0 -19
- data/test/devise_test.rb +0 -83
- data/test/failure_app_test.rb +0 -221
- data/test/generators/active_record_generator_test.rb +0 -73
- 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 -67
- data/test/helpers/devise_helper_test.rb +0 -51
- data/test/integration/authenticatable_test.rb +0 -699
- data/test/integration/confirmable_test.rb +0 -299
- data/test/integration/database_authenticatable_test.rb +0 -84
- data/test/integration/http_authenticatable_test.rb +0 -115
- data/test/integration/lockable_test.rb +0 -242
- data/test/integration/omniauthable_test.rb +0 -133
- data/test/integration/recoverable_test.rb +0 -335
- data/test/integration/registerable_test.rb +0 -349
- data/test/integration/rememberable_test.rb +0 -165
- data/test/integration/timeoutable_test.rb +0 -150
- data/test/integration/token_authenticatable_test.rb +0 -205
- data/test/integration/trackable_test.rb +0 -92
- data/test/mailers/confirmation_instructions_test.rb +0 -111
- data/test/mailers/reset_password_instructions_test.rb +0 -92
- data/test/mailers/unlock_instructions_test.rb +0 -87
- data/test/mapping_test.rb +0 -127
- data/test/models/authenticatable_test.rb +0 -13
- data/test/models/confirmable_test.rb +0 -452
- data/test/models/database_authenticatable_test.rb +0 -226
- data/test/models/lockable_test.rb +0 -282
- data/test/models/omniauthable_test.rb +0 -7
- data/test/models/recoverable_test.rb +0 -222
- data/test/models/registerable_test.rb +0 -7
- data/test/models/rememberable_test.rb +0 -175
- data/test/models/serializable_test.rb +0 -49
- data/test/models/timeoutable_test.rb +0 -46
- data/test/models/token_authenticatable_test.rb +0 -55
- data/test/models/trackable_test.rb +0 -13
- data/test/models/validatable_test.rb +0 -127
- data/test/models_test.rb +0 -163
- 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 -58
- 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/controllers/admins/sessions_controller.rb +0 -6
- data/test/rails_app/app/controllers/admins_controller.rb +0 -11
- data/test/rails_app/app/controllers/application_controller.rb +0 -9
- 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/mailer.rb +0 -12
- 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 -42
- 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/application.rb +0 -40
- data/test/rails_app/config/boot.rb +0 -8
- 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 -34
- data/test/rails_app/config/environments/production.rb +0 -84
- data/test/rails_app/config/environments/test.rb +0 -36
- data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
- data/test/rails_app/config/initializers/devise.rb +0 -178
- 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 -104
- data/test/rails_app/config.ru +0 -4
- data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -74
- data/test/rails_app/db/schema.rb +0 -52
- data/test/rails_app/lib/shared_admin.rb +0 -14
- data/test/rails_app/lib/shared_user.rb +0 -25
- 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/routes_test.rb +0 -250
- data/test/support/assertions.rb +0 -40
- data/test/support/helpers.rb +0 -91
- data/test/support/integration.rb +0 -92
- data/test/support/locale/en.yml +0 -4
- data/test/support/webrat/integrations/rails.rb +0 -24
- data/test/test_helper.rb +0 -34
- data/test/test_helpers_test.rb +0 -151
- data/test/test_models.rb +0 -26
|
@@ -1,111 +0,0 @@
|
|
|
1
|
-
require 'test_helper'
|
|
2
|
-
|
|
3
|
-
class ConfirmationInstructionsTest < ActionMailer::TestCase
|
|
4
|
-
|
|
5
|
-
def setup
|
|
6
|
-
setup_mailer
|
|
7
|
-
Devise.mailer = 'Devise::Mailer'
|
|
8
|
-
Devise.mailer_sender = 'test@example.com'
|
|
9
|
-
end
|
|
10
|
-
|
|
11
|
-
def teardown
|
|
12
|
-
Devise.mailer = 'Devise::Mailer'
|
|
13
|
-
Devise.mailer_sender = 'please-change-me@config-initializers-devise.com'
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
def user
|
|
17
|
-
@user ||= create_user
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
def mail
|
|
21
|
-
@mail ||= begin
|
|
22
|
-
user
|
|
23
|
-
ActionMailer::Base.deliveries.first
|
|
24
|
-
end
|
|
25
|
-
end
|
|
26
|
-
|
|
27
|
-
test 'email sent after creating the user' do
|
|
28
|
-
assert_not_nil mail
|
|
29
|
-
end
|
|
30
|
-
|
|
31
|
-
test 'content type should be set to html' do
|
|
32
|
-
assert mail.content_type.include?('text/html')
|
|
33
|
-
end
|
|
34
|
-
|
|
35
|
-
test 'send confirmation instructions to the user email' do
|
|
36
|
-
mail
|
|
37
|
-
assert_equal [user.email], mail.to
|
|
38
|
-
end
|
|
39
|
-
|
|
40
|
-
test 'setup sender from configuration' do
|
|
41
|
-
assert_equal ['test@example.com'], mail.from
|
|
42
|
-
end
|
|
43
|
-
|
|
44
|
-
test 'setup sender from custom mailer defaults' do
|
|
45
|
-
Devise.mailer = 'Users::Mailer'
|
|
46
|
-
assert_equal ['custom@example.com'], mail.from
|
|
47
|
-
end
|
|
48
|
-
|
|
49
|
-
test 'setup sender from custom mailer defaults with proc' do
|
|
50
|
-
Devise.mailer = 'Users::FromProcMailer'
|
|
51
|
-
assert_equal ['custom@example.com'], mail.from
|
|
52
|
-
end
|
|
53
|
-
|
|
54
|
-
test 'custom mailer renders parent mailer template' do
|
|
55
|
-
Devise.mailer = 'Users::Mailer'
|
|
56
|
-
assert_not_blank mail.body.encoded
|
|
57
|
-
end
|
|
58
|
-
|
|
59
|
-
test 'setup reply to as copy from sender' do
|
|
60
|
-
assert_equal ['test@example.com'], mail.reply_to
|
|
61
|
-
end
|
|
62
|
-
|
|
63
|
-
test 'setup reply to as different if set in defaults' do
|
|
64
|
-
Devise.mailer = 'Users::ReplyToMailer'
|
|
65
|
-
assert_equal ['custom@example.com'], mail.from
|
|
66
|
-
assert_equal ['custom_reply_to@example.com'], mail.reply_to
|
|
67
|
-
end
|
|
68
|
-
|
|
69
|
-
test 'setup subject from I18n' do
|
|
70
|
-
store_translations :en, :devise => { :mailer => { :confirmation_instructions => { :subject => 'Account Confirmation' } } } do
|
|
71
|
-
assert_equal 'Account Confirmation', mail.subject
|
|
72
|
-
end
|
|
73
|
-
end
|
|
74
|
-
|
|
75
|
-
test 'subject namespaced by model' do
|
|
76
|
-
store_translations :en, :devise => { :mailer => { :confirmation_instructions => { :user_subject => 'User Account Confirmation' } } } do
|
|
77
|
-
assert_equal 'User Account Confirmation', mail.subject
|
|
78
|
-
end
|
|
79
|
-
end
|
|
80
|
-
|
|
81
|
-
test 'body should have user info' do
|
|
82
|
-
assert_match user.email, mail.body.encoded
|
|
83
|
-
end
|
|
84
|
-
|
|
85
|
-
test 'body should have link to confirm the account' do
|
|
86
|
-
host = ActionMailer::Base.default_url_options[:host]
|
|
87
|
-
confirmation_url_regexp = %r{<a href=\"http://#{host}/users/confirmation\?confirmation_token=#{user.confirmation_token}">}
|
|
88
|
-
assert_match confirmation_url_regexp, mail.body.encoded
|
|
89
|
-
end
|
|
90
|
-
|
|
91
|
-
test 'renders a scoped if scoped_views is set to true' do
|
|
92
|
-
swap Devise, :scoped_views => true do
|
|
93
|
-
assert_equal user.email, mail.body.decoded
|
|
94
|
-
end
|
|
95
|
-
end
|
|
96
|
-
|
|
97
|
-
test 'renders a scoped if scoped_views is set in the mailer class' do
|
|
98
|
-
begin
|
|
99
|
-
Devise::Mailer.scoped_views = true
|
|
100
|
-
assert_equal user.email, mail.body.decoded
|
|
101
|
-
ensure
|
|
102
|
-
Devise::Mailer.send :remove_instance_variable, :@scoped_views
|
|
103
|
-
end
|
|
104
|
-
end
|
|
105
|
-
|
|
106
|
-
test 'mailer sender accepts a proc' do
|
|
107
|
-
swap Devise, :mailer_sender => proc { "another@example.com" } do
|
|
108
|
-
assert_equal ['another@example.com'], mail.from
|
|
109
|
-
end
|
|
110
|
-
end
|
|
111
|
-
end
|
|
@@ -1,92 +0,0 @@
|
|
|
1
|
-
require 'test_helper'
|
|
2
|
-
|
|
3
|
-
class ResetPasswordInstructionsTest < ActionMailer::TestCase
|
|
4
|
-
def setup
|
|
5
|
-
setup_mailer
|
|
6
|
-
Devise.mailer = 'Devise::Mailer'
|
|
7
|
-
Devise.mailer_sender = 'test@example.com'
|
|
8
|
-
end
|
|
9
|
-
|
|
10
|
-
def teardown
|
|
11
|
-
Devise.mailer = 'Devise::Mailer'
|
|
12
|
-
Devise.mailer_sender = 'please-change-me@config-initializers-devise.com'
|
|
13
|
-
end
|
|
14
|
-
|
|
15
|
-
def user
|
|
16
|
-
@user ||= begin
|
|
17
|
-
user = create_user
|
|
18
|
-
user.send_reset_password_instructions
|
|
19
|
-
user
|
|
20
|
-
end
|
|
21
|
-
end
|
|
22
|
-
|
|
23
|
-
def mail
|
|
24
|
-
@mail ||= begin
|
|
25
|
-
user
|
|
26
|
-
ActionMailer::Base.deliveries.last
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
test 'email sent after reseting the user password' do
|
|
31
|
-
assert_not_nil mail
|
|
32
|
-
end
|
|
33
|
-
|
|
34
|
-
test 'content type should be set to html' do
|
|
35
|
-
assert mail.content_type.include?('text/html')
|
|
36
|
-
end
|
|
37
|
-
|
|
38
|
-
test 'send confirmation instructions to the user email' do
|
|
39
|
-
assert_equal [user.email], mail.to
|
|
40
|
-
end
|
|
41
|
-
|
|
42
|
-
test 'setup sender from configuration' do
|
|
43
|
-
assert_equal ['test@example.com'], mail.from
|
|
44
|
-
end
|
|
45
|
-
|
|
46
|
-
test 'setup sender from custom mailer defaults' do
|
|
47
|
-
Devise.mailer = 'Users::Mailer'
|
|
48
|
-
assert_equal ['custom@example.com'], mail.from
|
|
49
|
-
end
|
|
50
|
-
|
|
51
|
-
test 'setup sender from custom mailer defaults with proc' do
|
|
52
|
-
Devise.mailer = 'Users::FromProcMailer'
|
|
53
|
-
assert_equal ['custom@example.com'], mail.from
|
|
54
|
-
end
|
|
55
|
-
|
|
56
|
-
test 'custom mailer renders parent mailer template' do
|
|
57
|
-
Devise.mailer = 'Users::Mailer'
|
|
58
|
-
assert_not_blank mail.body.encoded
|
|
59
|
-
end
|
|
60
|
-
|
|
61
|
-
test 'setup reply to as copy from sender' do
|
|
62
|
-
assert_equal ['test@example.com'], mail.reply_to
|
|
63
|
-
end
|
|
64
|
-
|
|
65
|
-
test 'setup subject from I18n' do
|
|
66
|
-
store_translations :en, :devise => { :mailer => { :reset_password_instructions => { :subject => 'Reset instructions' } } } do
|
|
67
|
-
assert_equal 'Reset instructions', mail.subject
|
|
68
|
-
end
|
|
69
|
-
end
|
|
70
|
-
|
|
71
|
-
test 'subject namespaced by model' do
|
|
72
|
-
store_translations :en, :devise => { :mailer => { :reset_password_instructions => { :user_subject => 'User Reset Instructions' } } } do
|
|
73
|
-
assert_equal 'User Reset Instructions', mail.subject
|
|
74
|
-
end
|
|
75
|
-
end
|
|
76
|
-
|
|
77
|
-
test 'body should have user info' do
|
|
78
|
-
assert_match user.email, mail.body.encoded
|
|
79
|
-
end
|
|
80
|
-
|
|
81
|
-
test 'body should have link to confirm the account' do
|
|
82
|
-
host = ActionMailer::Base.default_url_options[:host]
|
|
83
|
-
reset_url_regexp = %r{<a href=\"http://#{host}/users/password/edit\?reset_password_token=#{user.reset_password_token}">}
|
|
84
|
-
assert_match reset_url_regexp, mail.body.encoded
|
|
85
|
-
end
|
|
86
|
-
|
|
87
|
-
test 'mailer sender accepts a proc' do
|
|
88
|
-
swap Devise, :mailer_sender => proc { "another@example.com" } do
|
|
89
|
-
assert_equal ['another@example.com'], mail.from
|
|
90
|
-
end
|
|
91
|
-
end
|
|
92
|
-
end
|
|
@@ -1,87 +0,0 @@
|
|
|
1
|
-
require 'test_helper'
|
|
2
|
-
|
|
3
|
-
class UnlockInstructionsTest < ActionMailer::TestCase
|
|
4
|
-
|
|
5
|
-
def setup
|
|
6
|
-
setup_mailer
|
|
7
|
-
Devise.mailer = 'Devise::Mailer'
|
|
8
|
-
Devise.mailer_sender = 'test@example.com'
|
|
9
|
-
end
|
|
10
|
-
|
|
11
|
-
def teardown
|
|
12
|
-
Devise.mailer = 'Devise::Mailer'
|
|
13
|
-
Devise.mailer_sender = 'please-change-me@config-initializers-devise.com'
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
def user
|
|
17
|
-
@user ||= begin
|
|
18
|
-
user = create_user
|
|
19
|
-
user.lock_access!
|
|
20
|
-
user
|
|
21
|
-
end
|
|
22
|
-
end
|
|
23
|
-
|
|
24
|
-
def mail
|
|
25
|
-
@mail ||= begin
|
|
26
|
-
user
|
|
27
|
-
ActionMailer::Base.deliveries.last
|
|
28
|
-
end
|
|
29
|
-
end
|
|
30
|
-
|
|
31
|
-
test 'email sent after locking the user' do
|
|
32
|
-
assert_not_nil mail
|
|
33
|
-
end
|
|
34
|
-
|
|
35
|
-
test 'content type should be set to html' do
|
|
36
|
-
assert mail.content_type.include?('text/html')
|
|
37
|
-
end
|
|
38
|
-
|
|
39
|
-
test 'send unlock instructions to the user email' do
|
|
40
|
-
assert_equal [user.email], mail.to
|
|
41
|
-
end
|
|
42
|
-
|
|
43
|
-
test 'setup sender from configuration' do
|
|
44
|
-
assert_equal ['test@example.com'], mail.from
|
|
45
|
-
end
|
|
46
|
-
|
|
47
|
-
test 'setup sender from custom mailer defaults' do
|
|
48
|
-
Devise.mailer = 'Users::Mailer'
|
|
49
|
-
assert_equal ['custom@example.com'], mail.from
|
|
50
|
-
end
|
|
51
|
-
|
|
52
|
-
test 'setup sender from custom mailer defaults with proc' do
|
|
53
|
-
Devise.mailer = 'Users::FromProcMailer'
|
|
54
|
-
assert_equal ['custom@example.com'], mail.from
|
|
55
|
-
end
|
|
56
|
-
|
|
57
|
-
test 'custom mailer renders parent mailer template' do
|
|
58
|
-
Devise.mailer = 'Users::Mailer'
|
|
59
|
-
assert_not_blank mail.body.encoded
|
|
60
|
-
end
|
|
61
|
-
|
|
62
|
-
test 'setup reply to as copy from sender' do
|
|
63
|
-
assert_equal ['test@example.com'], mail.reply_to
|
|
64
|
-
end
|
|
65
|
-
|
|
66
|
-
test 'setup subject from I18n' do
|
|
67
|
-
store_translations :en, :devise => { :mailer => { :unlock_instructions => { :subject => 'Yo unlock instructions' } } } do
|
|
68
|
-
assert_equal 'Yo unlock instructions', mail.subject
|
|
69
|
-
end
|
|
70
|
-
end
|
|
71
|
-
|
|
72
|
-
test 'subject namespaced by model' do
|
|
73
|
-
store_translations :en, :devise => { :mailer => { :unlock_instructions => { :user_subject => 'User Unlock Instructions' } } } do
|
|
74
|
-
assert_equal 'User Unlock Instructions', mail.subject
|
|
75
|
-
end
|
|
76
|
-
end
|
|
77
|
-
|
|
78
|
-
test 'body should have user info' do
|
|
79
|
-
assert_match user.email, mail.body.encoded
|
|
80
|
-
end
|
|
81
|
-
|
|
82
|
-
test 'body should have link to unlock the account' do
|
|
83
|
-
host = ActionMailer::Base.default_url_options[:host]
|
|
84
|
-
unlock_url_regexp = %r{<a href=\"http://#{host}/users/unlock\?unlock_token=#{user.unlock_token}">}
|
|
85
|
-
assert_match unlock_url_regexp, mail.body.encoded
|
|
86
|
-
end
|
|
87
|
-
end
|
data/test/mapping_test.rb
DELETED
|
@@ -1,127 +0,0 @@
|
|
|
1
|
-
require 'test_helper'
|
|
2
|
-
|
|
3
|
-
class FakeRequest < Struct.new(:path_info, :params)
|
|
4
|
-
end
|
|
5
|
-
|
|
6
|
-
class MappingTest < ActiveSupport::TestCase
|
|
7
|
-
def fake_request(path, params={})
|
|
8
|
-
FakeRequest.new(path, params)
|
|
9
|
-
end
|
|
10
|
-
|
|
11
|
-
test 'store options' do
|
|
12
|
-
mapping = Devise.mappings[:user]
|
|
13
|
-
assert_equal User, mapping.to
|
|
14
|
-
assert_equal User.devise_modules, mapping.modules
|
|
15
|
-
assert_equal "users", mapping.scoped_path
|
|
16
|
-
assert_equal :user, mapping.singular
|
|
17
|
-
assert_equal "users", mapping.path
|
|
18
|
-
assert_equal "/users", mapping.fullpath
|
|
19
|
-
end
|
|
20
|
-
|
|
21
|
-
test 'store options with namespace' do
|
|
22
|
-
mapping = Devise.mappings[:publisher_account]
|
|
23
|
-
assert_equal Admin, mapping.to
|
|
24
|
-
assert_equal "publisher/accounts", mapping.scoped_path
|
|
25
|
-
assert_equal :publisher_account, mapping.singular
|
|
26
|
-
assert_equal "accounts", mapping.path
|
|
27
|
-
assert_equal "/publisher/accounts", mapping.fullpath
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
test 'allows path to be given' do
|
|
31
|
-
assert_equal "admin_area", Devise.mappings[:admin].path
|
|
32
|
-
end
|
|
33
|
-
|
|
34
|
-
test 'allows to skip all routes' do
|
|
35
|
-
assert_equal [], Devise.mappings[:skip_admin].used_routes
|
|
36
|
-
end
|
|
37
|
-
|
|
38
|
-
test 'sign_out_via defaults to :get' do
|
|
39
|
-
assert_equal :get, Devise.mappings[:user].sign_out_via
|
|
40
|
-
end
|
|
41
|
-
|
|
42
|
-
test 'allows custom sign_out_via to be given' do
|
|
43
|
-
assert_equal :delete, Devise.mappings[:sign_out_via_delete].sign_out_via
|
|
44
|
-
assert_equal :post, Devise.mappings[:sign_out_via_post].sign_out_via
|
|
45
|
-
assert_equal [:delete, :post], Devise.mappings[:sign_out_via_delete_or_post].sign_out_via
|
|
46
|
-
end
|
|
47
|
-
|
|
48
|
-
test 'allows custom singular to be given' do
|
|
49
|
-
assert_equal "accounts", Devise.mappings[:manager].path
|
|
50
|
-
end
|
|
51
|
-
|
|
52
|
-
test 'has strategies depending on the model declaration' do
|
|
53
|
-
assert_equal [:rememberable, :token_authenticatable, :database_authenticatable], Devise.mappings[:user].strategies
|
|
54
|
-
assert_equal [:database_authenticatable], Devise.mappings[:admin].strategies
|
|
55
|
-
end
|
|
56
|
-
|
|
57
|
-
test 'has no input strategies depending on the model declaration' do
|
|
58
|
-
assert_equal [:rememberable, :token_authenticatable], Devise.mappings[:user].no_input_strategies
|
|
59
|
-
assert_equal [], Devise.mappings[:admin].no_input_strategies
|
|
60
|
-
end
|
|
61
|
-
|
|
62
|
-
test 'find scope for a given object' do
|
|
63
|
-
assert_equal :user, Devise::Mapping.find_scope!(User)
|
|
64
|
-
assert_equal :user, Devise::Mapping.find_scope!(:user)
|
|
65
|
-
assert_equal :user, Devise::Mapping.find_scope!(User.new)
|
|
66
|
-
end
|
|
67
|
-
|
|
68
|
-
test 'find scope works with single table inheritance' do
|
|
69
|
-
assert_equal :user, Devise::Mapping.find_scope!(Class.new(User))
|
|
70
|
-
assert_equal :user, Devise::Mapping.find_scope!(Class.new(User).new)
|
|
71
|
-
end
|
|
72
|
-
|
|
73
|
-
test 'find scope raises an error if cannot be found' do
|
|
74
|
-
assert_raise RuntimeError do
|
|
75
|
-
Devise::Mapping.find_scope!(String)
|
|
76
|
-
end
|
|
77
|
-
end
|
|
78
|
-
|
|
79
|
-
test 'return default path names' do
|
|
80
|
-
mapping = Devise.mappings[:user]
|
|
81
|
-
assert_equal 'sign_in', mapping.path_names[:sign_in]
|
|
82
|
-
assert_equal 'sign_out', mapping.path_names[:sign_out]
|
|
83
|
-
assert_equal 'password', mapping.path_names[:password]
|
|
84
|
-
assert_equal 'confirmation', mapping.path_names[:confirmation]
|
|
85
|
-
assert_equal 'sign_up', mapping.path_names[:sign_up]
|
|
86
|
-
assert_equal 'unlock', mapping.path_names[:unlock]
|
|
87
|
-
end
|
|
88
|
-
|
|
89
|
-
test 'allow custom path names to be given' do
|
|
90
|
-
mapping = Devise.mappings[:manager]
|
|
91
|
-
assert_equal 'login', mapping.path_names[:sign_in]
|
|
92
|
-
assert_equal 'logout', mapping.path_names[:sign_out]
|
|
93
|
-
assert_equal 'secret', mapping.path_names[:password]
|
|
94
|
-
assert_equal 'verification', mapping.path_names[:confirmation]
|
|
95
|
-
assert_equal 'register', mapping.path_names[:sign_up]
|
|
96
|
-
assert_equal 'unblock', mapping.path_names[:unlock]
|
|
97
|
-
end
|
|
98
|
-
|
|
99
|
-
test 'magic predicates' do
|
|
100
|
-
mapping = Devise.mappings[:user]
|
|
101
|
-
assert mapping.authenticatable?
|
|
102
|
-
assert mapping.confirmable?
|
|
103
|
-
assert mapping.recoverable?
|
|
104
|
-
assert mapping.rememberable?
|
|
105
|
-
assert mapping.registerable?
|
|
106
|
-
|
|
107
|
-
mapping = Devise.mappings[:admin]
|
|
108
|
-
assert mapping.authenticatable?
|
|
109
|
-
assert mapping.recoverable?
|
|
110
|
-
assert mapping.lockable?
|
|
111
|
-
assert_not mapping.omniauthable?
|
|
112
|
-
end
|
|
113
|
-
|
|
114
|
-
test 'find mapping by path' do
|
|
115
|
-
assert_raise RuntimeError do
|
|
116
|
-
Devise::Mapping.find_by_path!('/accounts/facebook/callback')
|
|
117
|
-
end
|
|
118
|
-
|
|
119
|
-
assert_nothing_raised do
|
|
120
|
-
Devise::Mapping.find_by_path!('/:locale/accounts/login')
|
|
121
|
-
end
|
|
122
|
-
|
|
123
|
-
assert_nothing_raised do
|
|
124
|
-
Devise::Mapping.find_by_path!('/accounts/facebook/callback', :path)
|
|
125
|
-
end
|
|
126
|
-
end
|
|
127
|
-
end
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
require 'test_helper'
|
|
2
|
-
|
|
3
|
-
class AuthenticatableTest < ActiveSupport::TestCase
|
|
4
|
-
test 'required_fields should be an empty array' do
|
|
5
|
-
assert_equal Devise::Models::Validatable.required_fields(User), []
|
|
6
|
-
end
|
|
7
|
-
|
|
8
|
-
test 'find_first_by_auth_conditions allows custom filtering parameters' do
|
|
9
|
-
user = User.create!(:email => "example@example.com", :password => "123456")
|
|
10
|
-
assert_equal User.find_first_by_auth_conditions({ :email => "example@example.com" }), user
|
|
11
|
-
assert_nil User.find_first_by_auth_conditions({ :email => "example@example.com" }, :id => user.id.to_s.next)
|
|
12
|
-
end
|
|
13
|
-
end
|