devise 3.5.10 → 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 +279 -1126
- data/MIT-LICENSE +2 -1
- data/README.md +291 -97
- data/app/controllers/devise/confirmations_controller.rb +3 -1
- data/app/controllers/devise/omniauth_callbacks_controller.rb +8 -6
- data/app/controllers/devise/passwords_controller.rb +7 -4
- data/app/controllers/devise/registrations_controller.rb +39 -18
- data/app/controllers/devise/sessions_controller.rb +9 -7
- data/app/controllers/devise/unlocks_controller.rb +4 -2
- data/app/controllers/devise_controller.rb +25 -12
- data/app/helpers/devise_helper.rb +23 -18
- data/app/mailers/devise/mailer.rb +10 -4
- data/app/views/devise/confirmations/new.html.erb +2 -2
- data/app/views/devise/mailer/email_changed.html.erb +7 -0
- data/app/views/devise/passwords/edit.html.erb +3 -3
- data/app/views/devise/passwords/new.html.erb +2 -2
- data/app/views/devise/registrations/edit.html.erb +9 -5
- data/app/views/devise/registrations/new.html.erb +4 -4
- data/app/views/devise/sessions/new.html.erb +4 -4
- data/app/views/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/devise/shared/_links.html.erb +8 -8
- data/app/views/devise/unlocks/new.html.erb +2 -2
- data/config/locales/en.yml +5 -2
- data/lib/devise.rb +57 -40
- data/lib/devise/controllers/helpers.rb +30 -27
- data/lib/devise/controllers/rememberable.rb +3 -1
- data/lib/devise/controllers/scoped_views.rb +2 -0
- data/lib/devise/controllers/sign_in_out.rb +39 -14
- data/lib/devise/controllers/store_location.rb +25 -7
- data/lib/devise/controllers/url_helpers.rb +3 -1
- data/lib/devise/delegator.rb +2 -0
- data/lib/devise/encryptor.rb +6 -4
- data/lib/devise/failure_app.rb +75 -38
- data/lib/devise/hooks/activatable.rb +2 -0
- data/lib/devise/hooks/csrf_cleaner.rb +2 -0
- data/lib/devise/hooks/forgetable.rb +2 -0
- data/lib/devise/hooks/lockable.rb +4 -2
- data/lib/devise/hooks/proxy.rb +3 -1
- data/lib/devise/hooks/rememberable.rb +2 -0
- data/lib/devise/hooks/timeoutable.rb +4 -2
- data/lib/devise/hooks/trackable.rb +2 -0
- data/lib/devise/mailers/helpers.rb +7 -4
- data/lib/devise/mapping.rb +3 -1
- data/lib/devise/models.rb +3 -1
- data/lib/devise/models/authenticatable.rb +63 -33
- data/lib/devise/models/confirmable.rb +90 -29
- data/lib/devise/models/database_authenticatable.rb +93 -22
- data/lib/devise/models/lockable.rb +19 -5
- data/lib/devise/models/omniauthable.rb +2 -0
- data/lib/devise/models/recoverable.rb +33 -21
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +6 -11
- data/lib/devise/models/timeoutable.rb +2 -0
- data/lib/devise/models/trackable.rb +15 -1
- data/lib/devise/models/validatable.rb +10 -3
- data/lib/devise/modules.rb +2 -0
- data/lib/devise/omniauth.rb +4 -5
- data/lib/devise/omniauth/config.rb +2 -0
- data/lib/devise/omniauth/url_helpers.rb +14 -5
- data/lib/devise/orm/active_record.rb +5 -1
- data/lib/devise/orm/mongoid.rb +6 -2
- data/lib/devise/parameter_filter.rb +4 -0
- data/lib/devise/parameter_sanitizer.rb +139 -65
- data/lib/devise/rails.rb +7 -16
- data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
- data/lib/devise/rails/routes.rb +48 -37
- data/lib/devise/rails/warden_compat.rb +3 -10
- data/lib/devise/secret_key_finder.rb +27 -0
- data/lib/devise/strategies/authenticatable.rb +3 -1
- data/lib/devise/strategies/base.rb +2 -0
- data/lib/devise/strategies/database_authenticatable.rb +11 -4
- data/lib/devise/strategies/rememberable.rb +2 -0
- data/lib/devise/test/controller_helpers.rb +167 -0
- data/lib/devise/test/integration_helpers.rb +63 -0
- data/lib/devise/test_helpers.rb +7 -124
- data/lib/devise/time_inflector.rb +2 -0
- data/lib/devise/token_generator.rb +3 -41
- data/lib/devise/version.rb +3 -1
- data/lib/generators/active_record/devise_generator.rb +46 -12
- data/lib/generators/active_record/templates/migration.rb +4 -2
- data/lib/generators/active_record/templates/migration_existing.rb +4 -2
- data/lib/generators/devise/controllers_generator.rb +3 -1
- data/lib/generators/devise/devise_generator.rb +5 -3
- data/lib/generators/devise/install_generator.rb +18 -5
- data/lib/generators/devise/orm_helpers.rb +10 -21
- data/lib/generators/devise/views_generator.rb +8 -9
- data/lib/generators/mongoid/devise_generator.rb +7 -5
- data/lib/generators/templates/README +9 -8
- data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
- data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +3 -1
- data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
- data/lib/generators/templates/controllers/registrations_controller.rb +6 -4
- data/lib/generators/templates/controllers/sessions_controller.rb +4 -2
- data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
- data/lib/generators/templates/devise.rb +63 -21
- data/lib/generators/templates/markerb/email_changed.markerb +7 -0
- data/lib/generators/templates/markerb/password_change.markerb +2 -2
- data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +5 -1
- data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
- data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
- data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
- data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
- data/lib/generators/templates/simple_form_for/sessions/new.html.erb +7 -2
- data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
- metadata +19 -317
- data/.gitignore +0 -10
- data/.travis.yml +0 -44
- data/.yardopts +0 -9
- data/CODE_OF_CONDUCT.md +0 -22
- data/CONTRIBUTING.md +0 -16
- data/Gemfile +0 -30
- data/Gemfile.lock +0 -187
- data/Rakefile +0 -36
- data/devise.gemspec +0 -27
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-3.2-stable +0 -29
- data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -172
- data/gemfiles/Gemfile.rails-4.0-stable +0 -30
- data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -166
- data/gemfiles/Gemfile.rails-4.1-stable +0 -30
- data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -171
- data/gemfiles/Gemfile.rails-4.2-stable +0 -30
- data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -193
- data/script/cached-bundle +0 -49
- data/script/s3-put +0 -71
- data/test/controllers/custom_registrations_controller_test.rb +0 -40
- data/test/controllers/custom_strategy_test.rb +0 -62
- data/test/controllers/helper_methods_test.rb +0 -21
- data/test/controllers/helpers_test.rb +0 -316
- data/test/controllers/inherited_controller_i18n_messages_test.rb +0 -51
- data/test/controllers/internal_helpers_test.rb +0 -129
- data/test/controllers/load_hooks_controller_test.rb +0 -19
- data/test/controllers/passwords_controller_test.rb +0 -31
- data/test/controllers/sessions_controller_test.rb +0 -103
- data/test/controllers/url_helpers_test.rb +0 -65
- data/test/delegator_test.rb +0 -19
- data/test/devise_test.rb +0 -107
- data/test/failure_app_test.rb +0 -315
- data/test/generators/active_record_generator_test.rb +0 -109
- data/test/generators/controllers_generator_test.rb +0 -48
- data/test/generators/devise_generator_test.rb +0 -39
- data/test/generators/install_generator_test.rb +0 -13
- data/test/generators/mongoid_generator_test.rb +0 -23
- data/test/generators/views_generator_test.rb +0 -103
- data/test/helpers/devise_helper_test.rb +0 -49
- data/test/integration/authenticatable_test.rb +0 -729
- data/test/integration/confirmable_test.rb +0 -324
- data/test/integration/database_authenticatable_test.rb +0 -95
- data/test/integration/http_authenticatable_test.rb +0 -105
- data/test/integration/lockable_test.rb +0 -239
- data/test/integration/omniauthable_test.rb +0 -135
- data/test/integration/recoverable_test.rb +0 -347
- data/test/integration/registerable_test.rb +0 -359
- data/test/integration/rememberable_test.rb +0 -214
- data/test/integration/timeoutable_test.rb +0 -184
- data/test/integration/trackable_test.rb +0 -92
- data/test/mailers/confirmation_instructions_test.rb +0 -115
- data/test/mailers/reset_password_instructions_test.rb +0 -96
- data/test/mailers/unlock_instructions_test.rb +0 -91
- data/test/mapping_test.rb +0 -134
- data/test/models/authenticatable_test.rb +0 -23
- data/test/models/confirmable_test.rb +0 -511
- data/test/models/database_authenticatable_test.rb +0 -269
- data/test/models/lockable_test.rb +0 -350
- data/test/models/omniauthable_test.rb +0 -7
- data/test/models/recoverable_test.rb +0 -251
- data/test/models/registerable_test.rb +0 -7
- data/test/models/rememberable_test.rb +0 -169
- data/test/models/serializable_test.rb +0 -49
- data/test/models/timeoutable_test.rb +0 -51
- data/test/models/trackable_test.rb +0 -41
- data/test/models/validatable_test.rb +0 -127
- data/test/models_test.rb +0 -153
- data/test/omniauth/config_test.rb +0 -57
- data/test/omniauth/url_helpers_test.rb +0 -54
- data/test/orm/active_record.rb +0 -10
- data/test/orm/mongoid.rb +0 -13
- data/test/parameter_sanitizer_test.rb +0 -81
- data/test/rails_app/Rakefile +0 -6
- data/test/rails_app/app/active_record/admin.rb +0 -6
- data/test/rails_app/app/active_record/shim.rb +0 -2
- data/test/rails_app/app/active_record/user.rb +0 -6
- data/test/rails_app/app/active_record/user_on_engine.rb +0 -7
- data/test/rails_app/app/active_record/user_on_main_app.rb +0 -7
- data/test/rails_app/app/active_record/user_without_email.rb +0 -8
- data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
- data/test/rails_app/app/controllers/admins_controller.rb +0 -6
- data/test/rails_app/app/controllers/application_controller.rb +0 -12
- data/test/rails_app/app/controllers/application_with_fake_engine.rb +0 -30
- data/test/rails_app/app/controllers/custom/registrations_controller.rb +0 -31
- data/test/rails_app/app/controllers/home_controller.rb +0 -25
- data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
- data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
- data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
- data/test/rails_app/app/controllers/users_controller.rb +0 -31
- data/test/rails_app/app/helpers/application_helper.rb +0 -3
- data/test/rails_app/app/mailers/users/from_proc_mailer.rb +0 -3
- data/test/rails_app/app/mailers/users/mailer.rb +0 -3
- data/test/rails_app/app/mailers/users/reply_to_mailer.rb +0 -4
- data/test/rails_app/app/mongoid/admin.rb +0 -29
- data/test/rails_app/app/mongoid/shim.rb +0 -23
- data/test/rails_app/app/mongoid/user.rb +0 -39
- data/test/rails_app/app/mongoid/user_on_engine.rb +0 -39
- data/test/rails_app/app/mongoid/user_on_main_app.rb +0 -39
- data/test/rails_app/app/mongoid/user_without_email.rb +0 -33
- data/test/rails_app/app/views/admins/index.html.erb +0 -1
- data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
- data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
- data/test/rails_app/app/views/home/index.html.erb +0 -1
- data/test/rails_app/app/views/home/join.html.erb +0 -1
- data/test/rails_app/app/views/home/private.html.erb +0 -1
- data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
- data/test/rails_app/app/views/layouts/application.html.erb +0 -24
- data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
- data/test/rails_app/app/views/users/index.html.erb +0 -1
- data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
- data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
- data/test/rails_app/bin/bundle +0 -3
- data/test/rails_app/bin/rails +0 -4
- data/test/rails_app/bin/rake +0 -4
- data/test/rails_app/config.ru +0 -4
- data/test/rails_app/config/application.rb +0 -40
- data/test/rails_app/config/boot.rb +0 -14
- data/test/rails_app/config/database.yml +0 -18
- data/test/rails_app/config/environment.rb +0 -5
- data/test/rails_app/config/environments/development.rb +0 -30
- data/test/rails_app/config/environments/production.rb +0 -84
- data/test/rails_app/config/environments/test.rb +0 -41
- data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
- data/test/rails_app/config/initializers/devise.rb +0 -180
- data/test/rails_app/config/initializers/inflections.rb +0 -2
- data/test/rails_app/config/initializers/secret_token.rb +0 -8
- data/test/rails_app/config/initializers/session_store.rb +0 -1
- data/test/rails_app/config/routes.rb +0 -125
- data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
- data/test/rails_app/db/schema.rb +0 -55
- data/test/rails_app/lib/shared_admin.rb +0 -17
- data/test/rails_app/lib/shared_user.rb +0 -29
- data/test/rails_app/lib/shared_user_without_email.rb +0 -26
- data/test/rails_app/lib/shared_user_without_omniauth.rb +0 -13
- data/test/rails_app/public/404.html +0 -26
- data/test/rails_app/public/422.html +0 -26
- data/test/rails_app/public/500.html +0 -26
- data/test/rails_app/public/favicon.ico +0 -0
- data/test/rails_test.rb +0 -9
- data/test/routes_test.rb +0 -264
- data/test/support/action_controller/record_identifier.rb +0 -10
- data/test/support/assertions.rb +0 -39
- data/test/support/helpers.rb +0 -77
- data/test/support/integration.rb +0 -92
- data/test/support/locale/en.yml +0 -8
- data/test/support/mongoid.yml +0 -6
- data/test/support/webrat/integrations/rails.rb +0 -24
- data/test/test_helper.rb +0 -34
- data/test/test_helpers_test.rb +0 -178
- data/test/test_models.rb +0 -33
- data/test/time_helpers.rb +0 -137
@@ -1,251 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
|
3
|
-
class RecoverableTest < ActiveSupport::TestCase
|
4
|
-
|
5
|
-
def setup
|
6
|
-
setup_mailer
|
7
|
-
end
|
8
|
-
|
9
|
-
test 'should not generate reset password token after creating a record' do
|
10
|
-
assert_nil new_user.reset_password_token
|
11
|
-
end
|
12
|
-
|
13
|
-
test 'should never generate the same reset password token for different users' do
|
14
|
-
reset_password_tokens = []
|
15
|
-
3.times do
|
16
|
-
user = create_user
|
17
|
-
user.send_reset_password_instructions
|
18
|
-
token = user.reset_password_token
|
19
|
-
assert !reset_password_tokens.include?(token)
|
20
|
-
reset_password_tokens << token
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
test 'should reset password and password confirmation from params' do
|
25
|
-
user = create_user
|
26
|
-
user.reset_password('123456789', '987654321')
|
27
|
-
assert_equal '123456789', user.password
|
28
|
-
assert_equal '987654321', user.password_confirmation
|
29
|
-
end
|
30
|
-
|
31
|
-
test 'should reset password and save the record' do
|
32
|
-
assert create_user.reset_password('123456789', '123456789')
|
33
|
-
end
|
34
|
-
|
35
|
-
test 'should clear reset password token while reseting the password' do
|
36
|
-
user = create_user
|
37
|
-
assert_nil user.reset_password_token
|
38
|
-
|
39
|
-
user.send_reset_password_instructions
|
40
|
-
assert_present user.reset_password_token
|
41
|
-
assert user.reset_password('123456789', '123456789')
|
42
|
-
assert_nil user.reset_password_token
|
43
|
-
end
|
44
|
-
|
45
|
-
test 'should not clear reset password token for new user' do
|
46
|
-
user = new_user
|
47
|
-
assert_nil user.reset_password_token
|
48
|
-
|
49
|
-
user.send_reset_password_instructions
|
50
|
-
assert_present user.reset_password_token
|
51
|
-
|
52
|
-
user.save
|
53
|
-
assert_present user.reset_password_token
|
54
|
-
end
|
55
|
-
|
56
|
-
test 'should clear reset password token if changing password' do
|
57
|
-
user = create_user
|
58
|
-
assert_nil user.reset_password_token
|
59
|
-
|
60
|
-
user.send_reset_password_instructions
|
61
|
-
assert_present user.reset_password_token
|
62
|
-
user.password = "123456678"
|
63
|
-
user.password_confirmation = "123456678"
|
64
|
-
user.save!
|
65
|
-
assert_nil user.reset_password_token
|
66
|
-
end
|
67
|
-
|
68
|
-
test 'should clear reset password token if changing email' do
|
69
|
-
user = create_user
|
70
|
-
assert_nil user.reset_password_token
|
71
|
-
|
72
|
-
user.send_reset_password_instructions
|
73
|
-
assert_present user.reset_password_token
|
74
|
-
user.email = "another@example.com"
|
75
|
-
user.save!
|
76
|
-
assert_nil user.reset_password_token
|
77
|
-
end
|
78
|
-
|
79
|
-
test 'should clear reset password successfully even if there is no email' do
|
80
|
-
user = create_user_without_email
|
81
|
-
assert_nil user.reset_password_token
|
82
|
-
|
83
|
-
user.send_reset_password_instructions
|
84
|
-
assert_present user.reset_password_token
|
85
|
-
user.password = "123456678"
|
86
|
-
user.password_confirmation = "123456678"
|
87
|
-
user.save!
|
88
|
-
assert_nil user.reset_password_token
|
89
|
-
end
|
90
|
-
|
91
|
-
test 'should not clear reset password token if record is invalid' do
|
92
|
-
user = create_user
|
93
|
-
user.send_reset_password_instructions
|
94
|
-
assert_present user.reset_password_token
|
95
|
-
assert_not user.reset_password('123456789', '987654321')
|
96
|
-
assert_present user.reset_password_token
|
97
|
-
end
|
98
|
-
|
99
|
-
test 'should not reset password with invalid data' do
|
100
|
-
user = create_user
|
101
|
-
user.stubs(:valid?).returns(false)
|
102
|
-
assert_not user.reset_password('123456789', '987654321')
|
103
|
-
end
|
104
|
-
|
105
|
-
test 'should reset reset password token and send instructions by email' do
|
106
|
-
user = create_user
|
107
|
-
assert_email_sent do
|
108
|
-
token = user.reset_password_token
|
109
|
-
user.send_reset_password_instructions
|
110
|
-
assert_not_equal token, user.reset_password_token
|
111
|
-
end
|
112
|
-
end
|
113
|
-
|
114
|
-
test 'should find a user to send instructions by email' do
|
115
|
-
user = create_user
|
116
|
-
reset_password_user = User.send_reset_password_instructions(email: user.email)
|
117
|
-
assert_equal reset_password_user, user
|
118
|
-
end
|
119
|
-
|
120
|
-
test 'should return a new record with errors if user was not found by e-mail' do
|
121
|
-
reset_password_user = User.send_reset_password_instructions(email: "invalid@example.com")
|
122
|
-
assert_not reset_password_user.persisted?
|
123
|
-
assert_equal "not found", reset_password_user.errors[:email].join
|
124
|
-
end
|
125
|
-
|
126
|
-
test 'should find a user to send instructions by authentication_keys' do
|
127
|
-
swap Devise, authentication_keys: [:username, :email] do
|
128
|
-
user = create_user
|
129
|
-
reset_password_user = User.send_reset_password_instructions(email: user.email, username: user.username)
|
130
|
-
assert_equal reset_password_user, user
|
131
|
-
end
|
132
|
-
end
|
133
|
-
|
134
|
-
test 'should require all reset_password_keys' do
|
135
|
-
swap Devise, reset_password_keys: [:username, :email] do
|
136
|
-
user = create_user
|
137
|
-
reset_password_user = User.send_reset_password_instructions(email: user.email)
|
138
|
-
assert_not reset_password_user.persisted?
|
139
|
-
assert_equal "can't be blank", reset_password_user.errors[:username].join
|
140
|
-
end
|
141
|
-
end
|
142
|
-
|
143
|
-
test 'should reset reset_password_token before send the reset instructions email' do
|
144
|
-
user = create_user
|
145
|
-
token = user.reset_password_token
|
146
|
-
User.send_reset_password_instructions(email: user.email)
|
147
|
-
assert_not_equal token, user.reload.reset_password_token
|
148
|
-
end
|
149
|
-
|
150
|
-
test 'should send email instructions to the user reset their password' do
|
151
|
-
user = create_user
|
152
|
-
assert_email_sent do
|
153
|
-
User.send_reset_password_instructions(email: user.email)
|
154
|
-
end
|
155
|
-
end
|
156
|
-
|
157
|
-
test 'should find a user to reset their password based on the raw token' do
|
158
|
-
user = create_user
|
159
|
-
raw = user.send_reset_password_instructions
|
160
|
-
|
161
|
-
reset_password_user = User.reset_password_by_token(reset_password_token: raw)
|
162
|
-
assert_equal reset_password_user, user
|
163
|
-
end
|
164
|
-
|
165
|
-
test 'should return a new record with errors if no reset_password_token is found' do
|
166
|
-
reset_password_user = User.reset_password_by_token(reset_password_token: 'invalid_token')
|
167
|
-
assert_not reset_password_user.persisted?
|
168
|
-
assert_equal "is invalid", reset_password_user.errors[:reset_password_token].join
|
169
|
-
end
|
170
|
-
|
171
|
-
test 'should return a new record with errors if reset_password_token is blank' do
|
172
|
-
reset_password_user = User.reset_password_by_token(reset_password_token: '')
|
173
|
-
assert_not reset_password_user.persisted?
|
174
|
-
assert_match "can't be blank", reset_password_user.errors[:reset_password_token].join
|
175
|
-
end
|
176
|
-
|
177
|
-
test 'should return a new record with errors if password is blank' do
|
178
|
-
user = create_user
|
179
|
-
raw = user.send_reset_password_instructions
|
180
|
-
|
181
|
-
reset_password_user = User.reset_password_by_token(reset_password_token: raw, password: '')
|
182
|
-
assert_not reset_password_user.errors.empty?
|
183
|
-
assert_match "can't be blank", reset_password_user.errors[:password].join
|
184
|
-
assert_equal raw, reset_password_user.reset_password_token
|
185
|
-
end
|
186
|
-
|
187
|
-
test 'should reset successfully user password given the new password and confirmation' do
|
188
|
-
user = create_user
|
189
|
-
old_password = user.password
|
190
|
-
raw = user.send_reset_password_instructions
|
191
|
-
|
192
|
-
reset_password_user = User.reset_password_by_token(
|
193
|
-
reset_password_token: raw,
|
194
|
-
password: 'new_password',
|
195
|
-
password_confirmation: 'new_password'
|
196
|
-
)
|
197
|
-
assert_nil reset_password_user.reset_password_token
|
198
|
-
|
199
|
-
user.reload
|
200
|
-
assert_not user.valid_password?(old_password)
|
201
|
-
assert user.valid_password?('new_password')
|
202
|
-
assert_nil user.reset_password_token
|
203
|
-
end
|
204
|
-
|
205
|
-
test 'should not reset password after reset_password_within time' do
|
206
|
-
swap Devise, reset_password_within: 1.hour do
|
207
|
-
user = create_user
|
208
|
-
raw = user.send_reset_password_instructions
|
209
|
-
|
210
|
-
old_password = user.password
|
211
|
-
user.reset_password_sent_at = 2.days.ago
|
212
|
-
user.save!
|
213
|
-
|
214
|
-
reset_password_user = User.reset_password_by_token(
|
215
|
-
reset_password_token: raw,
|
216
|
-
password: 'new_password',
|
217
|
-
password_confirmation: 'new_password'
|
218
|
-
)
|
219
|
-
user.reload
|
220
|
-
|
221
|
-
assert user.valid_password?(old_password)
|
222
|
-
assert_not user.valid_password?('new_password')
|
223
|
-
assert_equal "has expired, please request a new one", reset_password_user.errors[:reset_password_token].join
|
224
|
-
end
|
225
|
-
end
|
226
|
-
|
227
|
-
test 'required_fields should contain the fields that Devise uses' do
|
228
|
-
assert_same_content Devise::Models::Recoverable.required_fields(User), [
|
229
|
-
:reset_password_sent_at,
|
230
|
-
:reset_password_token
|
231
|
-
]
|
232
|
-
end
|
233
|
-
|
234
|
-
test 'should return a user based on the raw token' do
|
235
|
-
user = create_user
|
236
|
-
raw = user.send_reset_password_instructions
|
237
|
-
|
238
|
-
assert_equal User.with_reset_password_token(raw), user
|
239
|
-
end
|
240
|
-
|
241
|
-
test 'should return the same reset password token as generated' do
|
242
|
-
user = create_user
|
243
|
-
raw = user.send_reset_password_instructions
|
244
|
-
assert_equal Devise.token_generator.digest(self.class, :reset_password_token, raw), user.reset_password_token
|
245
|
-
end
|
246
|
-
|
247
|
-
test 'should return nil if a user based on the raw token is not found' do
|
248
|
-
assert_equal User.with_reset_password_token('random-token'), nil
|
249
|
-
end
|
250
|
-
|
251
|
-
end
|
@@ -1,169 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
|
3
|
-
class RememberableTest < ActiveSupport::TestCase
|
4
|
-
def resource_class
|
5
|
-
User
|
6
|
-
end
|
7
|
-
|
8
|
-
def create_resource
|
9
|
-
create_user
|
10
|
-
end
|
11
|
-
|
12
|
-
test 'remember_me should not generate a new token if using salt' do
|
13
|
-
user = create_user
|
14
|
-
user.expects(:valid?).never
|
15
|
-
user.remember_me!
|
16
|
-
assert user.remember_created_at
|
17
|
-
end
|
18
|
-
|
19
|
-
test 'remember_me should not generate a new token if valid token exists' do
|
20
|
-
user = create_user
|
21
|
-
user.singleton_class.send(:attr_accessor, :remember_token)
|
22
|
-
User.to_adapter.expects(:find_first).returns(nil)
|
23
|
-
|
24
|
-
user.remember_me!
|
25
|
-
existing_token = user.remember_token
|
26
|
-
|
27
|
-
user.remember_me!
|
28
|
-
assert_equal existing_token, user.remember_token
|
29
|
-
end
|
30
|
-
|
31
|
-
test 'forget_me should not clear remember token if using salt' do
|
32
|
-
user = create_user
|
33
|
-
user.remember_me!
|
34
|
-
user.expects(:valid?).never
|
35
|
-
user.forget_me!
|
36
|
-
end
|
37
|
-
|
38
|
-
test 'can generate remember token' do
|
39
|
-
user = create_user
|
40
|
-
user.singleton_class.send(:attr_accessor, :remember_token)
|
41
|
-
User.to_adapter.expects(:find_first).returns(nil)
|
42
|
-
user.remember_me!
|
43
|
-
assert user.remember_token
|
44
|
-
end
|
45
|
-
|
46
|
-
test 'serialize into cookie' do
|
47
|
-
user = create_user
|
48
|
-
user.remember_me!
|
49
|
-
id, token, date = User.serialize_into_cookie(user)
|
50
|
-
assert_equal id, user.to_key
|
51
|
-
assert_equal token, user.authenticatable_salt
|
52
|
-
assert date.is_a?(String)
|
53
|
-
end
|
54
|
-
|
55
|
-
test 'serialize from cookie' do
|
56
|
-
user = create_user
|
57
|
-
user.remember_me!
|
58
|
-
assert_equal user, User.serialize_from_cookie(user.to_key, user.authenticatable_salt, Time.now.utc)
|
59
|
-
end
|
60
|
-
|
61
|
-
test 'serialize from cookie should accept a String with the datetime seconds and microseconds' do
|
62
|
-
user = create_user
|
63
|
-
user.remember_me!
|
64
|
-
assert_equal user, User.serialize_from_cookie(user.to_key, user.authenticatable_salt, Time.now.utc.to_f.to_json)
|
65
|
-
end
|
66
|
-
|
67
|
-
test 'serialize from cookie should return nil with invalid datetime' do
|
68
|
-
user = create_user
|
69
|
-
user.remember_me!
|
70
|
-
assert_nil User.serialize_from_cookie(user.to_key, user.authenticatable_salt, "2013")
|
71
|
-
end
|
72
|
-
|
73
|
-
test 'serialize from cookie should return nil if no resource is found' do
|
74
|
-
assert_nil resource_class.serialize_from_cookie([0], "123", Time.now.utc)
|
75
|
-
end
|
76
|
-
|
77
|
-
test 'serialize from cookie should return nil if no timestamp' do
|
78
|
-
user = create_user
|
79
|
-
user.remember_me!
|
80
|
-
assert_nil User.serialize_from_cookie(user.to_key, user.authenticatable_salt)
|
81
|
-
end
|
82
|
-
|
83
|
-
test 'serialize from cookie should return nil if timestamp is earlier than token creation' do
|
84
|
-
user = create_user
|
85
|
-
user.remember_me!
|
86
|
-
assert_nil User.serialize_from_cookie(user.to_key, user.authenticatable_salt, 1.day.ago)
|
87
|
-
end
|
88
|
-
|
89
|
-
test 'serialize from cookie should return nil if timestamp is older than remember_for' do
|
90
|
-
user = create_user
|
91
|
-
user.remember_created_at = 1.month.ago
|
92
|
-
user.remember_me!
|
93
|
-
assert_nil User.serialize_from_cookie(user.to_key, user.authenticatable_salt, 3.weeks.ago)
|
94
|
-
end
|
95
|
-
|
96
|
-
test 'serialize from cookie me return nil if is a valid resource with invalid token' do
|
97
|
-
user = create_user
|
98
|
-
user.remember_me!
|
99
|
-
assert_nil User.serialize_from_cookie(user.to_key, "123", Time.now.utc)
|
100
|
-
end
|
101
|
-
|
102
|
-
test 'raises a RuntimeError if authenticatable_salt is nil or empty' do
|
103
|
-
user = User.new
|
104
|
-
def user.authenticable_salt; nil; end
|
105
|
-
assert_raise RuntimeError do
|
106
|
-
user.rememberable_value
|
107
|
-
end
|
108
|
-
|
109
|
-
user = User.new
|
110
|
-
def user.authenticable_salt; ""; end
|
111
|
-
assert_raise RuntimeError do
|
112
|
-
user.rememberable_value
|
113
|
-
end
|
114
|
-
end
|
115
|
-
|
116
|
-
test 'should respond to remember_me attribute' do
|
117
|
-
assert resource_class.new.respond_to?(:remember_me)
|
118
|
-
assert resource_class.new.respond_to?(:remember_me=)
|
119
|
-
end
|
120
|
-
|
121
|
-
test 'forget_me should clear remember_created_at if expire_all_remember_me_on_sign_out is true' do
|
122
|
-
swap Devise, expire_all_remember_me_on_sign_out: true do
|
123
|
-
resource = create_resource
|
124
|
-
resource.remember_me!
|
125
|
-
assert_not_nil resource.remember_created_at
|
126
|
-
|
127
|
-
resource.forget_me!
|
128
|
-
assert_nil resource.remember_created_at
|
129
|
-
end
|
130
|
-
end
|
131
|
-
|
132
|
-
test 'forget_me should not clear remember_created_at if expire_all_remember_me_on_sign_out is false' do
|
133
|
-
swap Devise, expire_all_remember_me_on_sign_out: false do
|
134
|
-
resource = create_resource
|
135
|
-
resource.remember_me!
|
136
|
-
|
137
|
-
assert_not_nil resource.remember_created_at
|
138
|
-
|
139
|
-
resource.forget_me!
|
140
|
-
assert_not_nil resource.remember_created_at
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
|
-
test 'forget_me should not try to update resource if it has been destroyed' do
|
145
|
-
resource = create_resource
|
146
|
-
resource.expects(:remember_created_at).never
|
147
|
-
resource.expects(:save).never
|
148
|
-
|
149
|
-
resource.destroy
|
150
|
-
resource.forget_me!
|
151
|
-
end
|
152
|
-
|
153
|
-
test 'remember expires at uses remember for configuration' do
|
154
|
-
swap Devise, remember_for: 3.days do
|
155
|
-
resource = create_resource
|
156
|
-
resource.remember_me!
|
157
|
-
assert_equal 3.days.from_now.to_date, resource.remember_expires_at.to_date
|
158
|
-
|
159
|
-
Devise.remember_for = 5.days
|
160
|
-
assert_equal 5.days.from_now.to_date, resource.remember_expires_at.to_date
|
161
|
-
end
|
162
|
-
end
|
163
|
-
|
164
|
-
test 'should have the required_fields array' do
|
165
|
-
assert_same_content Devise::Models::Rememberable.required_fields(User), [
|
166
|
-
:remember_created_at
|
167
|
-
]
|
168
|
-
end
|
169
|
-
end
|
@@ -1,49 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
|
3
|
-
class SerializableTest < ActiveSupport::TestCase
|
4
|
-
setup do
|
5
|
-
@user = create_user
|
6
|
-
end
|
7
|
-
|
8
|
-
test 'should not include unsafe keys on XML' do
|
9
|
-
assert_match(/email/, @user.to_xml)
|
10
|
-
assert_no_match(/confirmation-token/, @user.to_xml)
|
11
|
-
end
|
12
|
-
|
13
|
-
test 'should not include unsafe keys on XML even if a new except is provided' do
|
14
|
-
assert_no_match(/email/, @user.to_xml(except: :email))
|
15
|
-
assert_no_match(/confirmation-token/, @user.to_xml(except: :email))
|
16
|
-
end
|
17
|
-
|
18
|
-
test 'should include unsafe keys on XML if a force_except is provided' do
|
19
|
-
assert_no_match(/<email/, @user.to_xml(force_except: :email))
|
20
|
-
assert_match(/confirmation-token/, @user.to_xml(force_except: :email))
|
21
|
-
end
|
22
|
-
|
23
|
-
test 'should not include unsafe keys on JSON' do
|
24
|
-
keys = from_json().keys.select{ |key| !key.include?("id") }
|
25
|
-
assert_equal %w(created_at email facebook_token updated_at username), keys.sort
|
26
|
-
end
|
27
|
-
|
28
|
-
test 'should not include unsafe keys on JSON even if a new except is provided' do
|
29
|
-
assert_no_key "email", from_json(except: :email)
|
30
|
-
assert_no_key "confirmation_token", from_json(except: :email)
|
31
|
-
end
|
32
|
-
|
33
|
-
test 'should include unsafe keys on JSON if a force_except is provided' do
|
34
|
-
assert_no_key "email", from_json(force_except: :email)
|
35
|
-
assert_key "confirmation_token", from_json(force_except: :email)
|
36
|
-
end
|
37
|
-
|
38
|
-
def assert_key(key, subject)
|
39
|
-
assert subject.key?(key), "Expected #{subject.inspect} to have key #{key.inspect}"
|
40
|
-
end
|
41
|
-
|
42
|
-
def assert_no_key(key, subject)
|
43
|
-
assert !subject.key?(key), "Expected #{subject.inspect} to not have key #{key.inspect}"
|
44
|
-
end
|
45
|
-
|
46
|
-
def from_json(options=nil)
|
47
|
-
ActiveSupport::JSON.decode(@user.to_json(options))["user"]
|
48
|
-
end
|
49
|
-
end
|