devise 3.5.10 → 4.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (258) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +279 -1126
  3. data/MIT-LICENSE +2 -1
  4. data/README.md +291 -97
  5. data/app/controllers/devise/confirmations_controller.rb +3 -1
  6. data/app/controllers/devise/omniauth_callbacks_controller.rb +8 -6
  7. data/app/controllers/devise/passwords_controller.rb +7 -4
  8. data/app/controllers/devise/registrations_controller.rb +39 -18
  9. data/app/controllers/devise/sessions_controller.rb +9 -7
  10. data/app/controllers/devise/unlocks_controller.rb +4 -2
  11. data/app/controllers/devise_controller.rb +25 -12
  12. data/app/helpers/devise_helper.rb +23 -18
  13. data/app/mailers/devise/mailer.rb +10 -4
  14. data/app/views/devise/confirmations/new.html.erb +2 -2
  15. data/app/views/devise/mailer/email_changed.html.erb +7 -0
  16. data/app/views/devise/passwords/edit.html.erb +3 -3
  17. data/app/views/devise/passwords/new.html.erb +2 -2
  18. data/app/views/devise/registrations/edit.html.erb +9 -5
  19. data/app/views/devise/registrations/new.html.erb +4 -4
  20. data/app/views/devise/sessions/new.html.erb +4 -4
  21. data/app/views/devise/shared/_error_messages.html.erb +15 -0
  22. data/app/views/devise/shared/_links.html.erb +8 -8
  23. data/app/views/devise/unlocks/new.html.erb +2 -2
  24. data/config/locales/en.yml +5 -2
  25. data/lib/devise.rb +57 -40
  26. data/lib/devise/controllers/helpers.rb +30 -27
  27. data/lib/devise/controllers/rememberable.rb +3 -1
  28. data/lib/devise/controllers/scoped_views.rb +2 -0
  29. data/lib/devise/controllers/sign_in_out.rb +39 -14
  30. data/lib/devise/controllers/store_location.rb +25 -7
  31. data/lib/devise/controllers/url_helpers.rb +3 -1
  32. data/lib/devise/delegator.rb +2 -0
  33. data/lib/devise/encryptor.rb +6 -4
  34. data/lib/devise/failure_app.rb +75 -38
  35. data/lib/devise/hooks/activatable.rb +2 -0
  36. data/lib/devise/hooks/csrf_cleaner.rb +2 -0
  37. data/lib/devise/hooks/forgetable.rb +2 -0
  38. data/lib/devise/hooks/lockable.rb +4 -2
  39. data/lib/devise/hooks/proxy.rb +3 -1
  40. data/lib/devise/hooks/rememberable.rb +2 -0
  41. data/lib/devise/hooks/timeoutable.rb +4 -2
  42. data/lib/devise/hooks/trackable.rb +2 -0
  43. data/lib/devise/mailers/helpers.rb +7 -4
  44. data/lib/devise/mapping.rb +3 -1
  45. data/lib/devise/models.rb +3 -1
  46. data/lib/devise/models/authenticatable.rb +63 -33
  47. data/lib/devise/models/confirmable.rb +90 -29
  48. data/lib/devise/models/database_authenticatable.rb +93 -22
  49. data/lib/devise/models/lockable.rb +19 -5
  50. data/lib/devise/models/omniauthable.rb +2 -0
  51. data/lib/devise/models/recoverable.rb +33 -21
  52. data/lib/devise/models/registerable.rb +4 -0
  53. data/lib/devise/models/rememberable.rb +6 -11
  54. data/lib/devise/models/timeoutable.rb +2 -0
  55. data/lib/devise/models/trackable.rb +15 -1
  56. data/lib/devise/models/validatable.rb +10 -3
  57. data/lib/devise/modules.rb +2 -0
  58. data/lib/devise/omniauth.rb +4 -5
  59. data/lib/devise/omniauth/config.rb +2 -0
  60. data/lib/devise/omniauth/url_helpers.rb +14 -5
  61. data/lib/devise/orm/active_record.rb +5 -1
  62. data/lib/devise/orm/mongoid.rb +6 -2
  63. data/lib/devise/parameter_filter.rb +4 -0
  64. data/lib/devise/parameter_sanitizer.rb +139 -65
  65. data/lib/devise/rails.rb +7 -16
  66. data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
  67. data/lib/devise/rails/routes.rb +48 -37
  68. data/lib/devise/rails/warden_compat.rb +3 -10
  69. data/lib/devise/secret_key_finder.rb +27 -0
  70. data/lib/devise/strategies/authenticatable.rb +3 -1
  71. data/lib/devise/strategies/base.rb +2 -0
  72. data/lib/devise/strategies/database_authenticatable.rb +11 -4
  73. data/lib/devise/strategies/rememberable.rb +2 -0
  74. data/lib/devise/test/controller_helpers.rb +167 -0
  75. data/lib/devise/test/integration_helpers.rb +63 -0
  76. data/lib/devise/test_helpers.rb +7 -124
  77. data/lib/devise/time_inflector.rb +2 -0
  78. data/lib/devise/token_generator.rb +3 -41
  79. data/lib/devise/version.rb +3 -1
  80. data/lib/generators/active_record/devise_generator.rb +46 -12
  81. data/lib/generators/active_record/templates/migration.rb +4 -2
  82. data/lib/generators/active_record/templates/migration_existing.rb +4 -2
  83. data/lib/generators/devise/controllers_generator.rb +3 -1
  84. data/lib/generators/devise/devise_generator.rb +5 -3
  85. data/lib/generators/devise/install_generator.rb +18 -5
  86. data/lib/generators/devise/orm_helpers.rb +10 -21
  87. data/lib/generators/devise/views_generator.rb +8 -9
  88. data/lib/generators/mongoid/devise_generator.rb +7 -5
  89. data/lib/generators/templates/README +9 -8
  90. data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
  91. data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +3 -1
  92. data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
  93. data/lib/generators/templates/controllers/registrations_controller.rb +6 -4
  94. data/lib/generators/templates/controllers/sessions_controller.rb +4 -2
  95. data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
  96. data/lib/generators/templates/devise.rb +63 -21
  97. data/lib/generators/templates/markerb/email_changed.markerb +7 -0
  98. data/lib/generators/templates/markerb/password_change.markerb +2 -2
  99. data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +5 -1
  100. data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
  101. data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
  102. data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
  103. data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
  104. data/lib/generators/templates/simple_form_for/sessions/new.html.erb +7 -2
  105. data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
  106. metadata +19 -317
  107. data/.gitignore +0 -10
  108. data/.travis.yml +0 -44
  109. data/.yardopts +0 -9
  110. data/CODE_OF_CONDUCT.md +0 -22
  111. data/CONTRIBUTING.md +0 -16
  112. data/Gemfile +0 -30
  113. data/Gemfile.lock +0 -187
  114. data/Rakefile +0 -36
  115. data/devise.gemspec +0 -27
  116. data/devise.png +0 -0
  117. data/gemfiles/Gemfile.rails-3.2-stable +0 -29
  118. data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -172
  119. data/gemfiles/Gemfile.rails-4.0-stable +0 -30
  120. data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -166
  121. data/gemfiles/Gemfile.rails-4.1-stable +0 -30
  122. data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -171
  123. data/gemfiles/Gemfile.rails-4.2-stable +0 -30
  124. data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -193
  125. data/script/cached-bundle +0 -49
  126. data/script/s3-put +0 -71
  127. data/test/controllers/custom_registrations_controller_test.rb +0 -40
  128. data/test/controllers/custom_strategy_test.rb +0 -62
  129. data/test/controllers/helper_methods_test.rb +0 -21
  130. data/test/controllers/helpers_test.rb +0 -316
  131. data/test/controllers/inherited_controller_i18n_messages_test.rb +0 -51
  132. data/test/controllers/internal_helpers_test.rb +0 -129
  133. data/test/controllers/load_hooks_controller_test.rb +0 -19
  134. data/test/controllers/passwords_controller_test.rb +0 -31
  135. data/test/controllers/sessions_controller_test.rb +0 -103
  136. data/test/controllers/url_helpers_test.rb +0 -65
  137. data/test/delegator_test.rb +0 -19
  138. data/test/devise_test.rb +0 -107
  139. data/test/failure_app_test.rb +0 -315
  140. data/test/generators/active_record_generator_test.rb +0 -109
  141. data/test/generators/controllers_generator_test.rb +0 -48
  142. data/test/generators/devise_generator_test.rb +0 -39
  143. data/test/generators/install_generator_test.rb +0 -13
  144. data/test/generators/mongoid_generator_test.rb +0 -23
  145. data/test/generators/views_generator_test.rb +0 -103
  146. data/test/helpers/devise_helper_test.rb +0 -49
  147. data/test/integration/authenticatable_test.rb +0 -729
  148. data/test/integration/confirmable_test.rb +0 -324
  149. data/test/integration/database_authenticatable_test.rb +0 -95
  150. data/test/integration/http_authenticatable_test.rb +0 -105
  151. data/test/integration/lockable_test.rb +0 -239
  152. data/test/integration/omniauthable_test.rb +0 -135
  153. data/test/integration/recoverable_test.rb +0 -347
  154. data/test/integration/registerable_test.rb +0 -359
  155. data/test/integration/rememberable_test.rb +0 -214
  156. data/test/integration/timeoutable_test.rb +0 -184
  157. data/test/integration/trackable_test.rb +0 -92
  158. data/test/mailers/confirmation_instructions_test.rb +0 -115
  159. data/test/mailers/reset_password_instructions_test.rb +0 -96
  160. data/test/mailers/unlock_instructions_test.rb +0 -91
  161. data/test/mapping_test.rb +0 -134
  162. data/test/models/authenticatable_test.rb +0 -23
  163. data/test/models/confirmable_test.rb +0 -511
  164. data/test/models/database_authenticatable_test.rb +0 -269
  165. data/test/models/lockable_test.rb +0 -350
  166. data/test/models/omniauthable_test.rb +0 -7
  167. data/test/models/recoverable_test.rb +0 -251
  168. data/test/models/registerable_test.rb +0 -7
  169. data/test/models/rememberable_test.rb +0 -169
  170. data/test/models/serializable_test.rb +0 -49
  171. data/test/models/timeoutable_test.rb +0 -51
  172. data/test/models/trackable_test.rb +0 -41
  173. data/test/models/validatable_test.rb +0 -127
  174. data/test/models_test.rb +0 -153
  175. data/test/omniauth/config_test.rb +0 -57
  176. data/test/omniauth/url_helpers_test.rb +0 -54
  177. data/test/orm/active_record.rb +0 -10
  178. data/test/orm/mongoid.rb +0 -13
  179. data/test/parameter_sanitizer_test.rb +0 -81
  180. data/test/rails_app/Rakefile +0 -6
  181. data/test/rails_app/app/active_record/admin.rb +0 -6
  182. data/test/rails_app/app/active_record/shim.rb +0 -2
  183. data/test/rails_app/app/active_record/user.rb +0 -6
  184. data/test/rails_app/app/active_record/user_on_engine.rb +0 -7
  185. data/test/rails_app/app/active_record/user_on_main_app.rb +0 -7
  186. data/test/rails_app/app/active_record/user_without_email.rb +0 -8
  187. data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
  188. data/test/rails_app/app/controllers/admins_controller.rb +0 -6
  189. data/test/rails_app/app/controllers/application_controller.rb +0 -12
  190. data/test/rails_app/app/controllers/application_with_fake_engine.rb +0 -30
  191. data/test/rails_app/app/controllers/custom/registrations_controller.rb +0 -31
  192. data/test/rails_app/app/controllers/home_controller.rb +0 -25
  193. data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
  194. data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
  195. data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
  196. data/test/rails_app/app/controllers/users_controller.rb +0 -31
  197. data/test/rails_app/app/helpers/application_helper.rb +0 -3
  198. data/test/rails_app/app/mailers/users/from_proc_mailer.rb +0 -3
  199. data/test/rails_app/app/mailers/users/mailer.rb +0 -3
  200. data/test/rails_app/app/mailers/users/reply_to_mailer.rb +0 -4
  201. data/test/rails_app/app/mongoid/admin.rb +0 -29
  202. data/test/rails_app/app/mongoid/shim.rb +0 -23
  203. data/test/rails_app/app/mongoid/user.rb +0 -39
  204. data/test/rails_app/app/mongoid/user_on_engine.rb +0 -39
  205. data/test/rails_app/app/mongoid/user_on_main_app.rb +0 -39
  206. data/test/rails_app/app/mongoid/user_without_email.rb +0 -33
  207. data/test/rails_app/app/views/admins/index.html.erb +0 -1
  208. data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
  209. data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
  210. data/test/rails_app/app/views/home/index.html.erb +0 -1
  211. data/test/rails_app/app/views/home/join.html.erb +0 -1
  212. data/test/rails_app/app/views/home/private.html.erb +0 -1
  213. data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
  214. data/test/rails_app/app/views/layouts/application.html.erb +0 -24
  215. data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
  216. data/test/rails_app/app/views/users/index.html.erb +0 -1
  217. data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
  218. data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
  219. data/test/rails_app/bin/bundle +0 -3
  220. data/test/rails_app/bin/rails +0 -4
  221. data/test/rails_app/bin/rake +0 -4
  222. data/test/rails_app/config.ru +0 -4
  223. data/test/rails_app/config/application.rb +0 -40
  224. data/test/rails_app/config/boot.rb +0 -14
  225. data/test/rails_app/config/database.yml +0 -18
  226. data/test/rails_app/config/environment.rb +0 -5
  227. data/test/rails_app/config/environments/development.rb +0 -30
  228. data/test/rails_app/config/environments/production.rb +0 -84
  229. data/test/rails_app/config/environments/test.rb +0 -41
  230. data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
  231. data/test/rails_app/config/initializers/devise.rb +0 -180
  232. data/test/rails_app/config/initializers/inflections.rb +0 -2
  233. data/test/rails_app/config/initializers/secret_token.rb +0 -8
  234. data/test/rails_app/config/initializers/session_store.rb +0 -1
  235. data/test/rails_app/config/routes.rb +0 -125
  236. data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
  237. data/test/rails_app/db/schema.rb +0 -55
  238. data/test/rails_app/lib/shared_admin.rb +0 -17
  239. data/test/rails_app/lib/shared_user.rb +0 -29
  240. data/test/rails_app/lib/shared_user_without_email.rb +0 -26
  241. data/test/rails_app/lib/shared_user_without_omniauth.rb +0 -13
  242. data/test/rails_app/public/404.html +0 -26
  243. data/test/rails_app/public/422.html +0 -26
  244. data/test/rails_app/public/500.html +0 -26
  245. data/test/rails_app/public/favicon.ico +0 -0
  246. data/test/rails_test.rb +0 -9
  247. data/test/routes_test.rb +0 -264
  248. data/test/support/action_controller/record_identifier.rb +0 -10
  249. data/test/support/assertions.rb +0 -39
  250. data/test/support/helpers.rb +0 -77
  251. data/test/support/integration.rb +0 -92
  252. data/test/support/locale/en.yml +0 -8
  253. data/test/support/mongoid.yml +0 -6
  254. data/test/support/webrat/integrations/rails.rb +0 -24
  255. data/test/test_helper.rb +0 -34
  256. data/test/test_helpers_test.rb +0 -178
  257. data/test/test_models.rb +0 -33
  258. data/test/time_helpers.rb +0 -137
@@ -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
@@ -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
@@ -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,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
@@ -1,8 +0,0 @@
1
- en:
2
- devise:
3
- failure:
4
- user:
5
- does_not_exist: "User %{name} does not exist"
6
- errors:
7
- messages:
8
- taken: "has already been taken"
@@ -1,6 +0,0 @@
1
- test:
2
- sessions:
3
- default:
4
- database: devise-test-suite
5
- hosts:
6
- - localhost:<%= ENV['MONGODB_PORT'] || '27017' %>
@@ -1,24 +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
- end
18
-
19
- module ActionDispatch #:nodoc:
20
- IntegrationTest.class_eval do
21
- include Webrat::Methods
22
- include Webrat::Matchers
23
- end
24
- 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"
@@ -1,178 +0,0 @@
1
- require 'test_helper'
2
-
3
- class TestHelpersTest < ActionController::TestCase
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, 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 = 306
72
- end
73
- end
74
-
75
- swap Devise.warden_config, failure_app: custom_failure_app do
76
- get :index
77
- assert_response 306
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 = 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