devise 3.2.4 → 4.7.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (235) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +259 -994
  3. data/MIT-LICENSE +1 -1
  4. data/README.md +336 -99
  5. data/app/controllers/devise/confirmations_controller.rb +9 -3
  6. data/app/controllers/devise/omniauth_callbacks_controller.rb +12 -6
  7. data/app/controllers/devise/passwords_controller.rb +19 -6
  8. data/app/controllers/devise/registrations_controller.rb +55 -22
  9. data/app/controllers/devise/sessions_controller.rb +44 -14
  10. data/app/controllers/devise/unlocks_controller.rb +7 -2
  11. data/app/controllers/devise_controller.rb +65 -29
  12. data/app/helpers/devise_helper.rb +12 -19
  13. data/app/mailers/devise/mailer.rb +10 -0
  14. data/app/views/devise/confirmations/new.html.erb +8 -4
  15. data/app/views/devise/mailer/email_changed.html.erb +7 -0
  16. data/app/views/devise/mailer/password_change.html.erb +3 -0
  17. data/app/views/devise/passwords/edit.html.erb +15 -6
  18. data/app/views/devise/passwords/new.html.erb +8 -4
  19. data/app/views/devise/registrations/edit.html.erb +27 -13
  20. data/app/views/devise/registrations/new.html.erb +19 -8
  21. data/app/views/devise/sessions/new.html.erb +18 -9
  22. data/app/views/devise/shared/_error_messages.html.erb +15 -0
  23. data/app/views/devise/shared/{_links.erb → _links.html.erb} +9 -9
  24. data/app/views/devise/unlocks/new.html.erb +8 -4
  25. data/config/locales/en.yml +22 -16
  26. data/lib/devise/controllers/helpers.rb +109 -29
  27. data/lib/devise/controllers/rememberable.rb +12 -3
  28. data/lib/devise/controllers/scoped_views.rb +2 -0
  29. data/lib/devise/controllers/sign_in_out.rb +36 -20
  30. data/lib/devise/controllers/store_location.rb +31 -5
  31. data/lib/devise/controllers/url_helpers.rb +9 -7
  32. data/lib/devise/delegator.rb +2 -0
  33. data/lib/devise/encryptor.rb +24 -0
  34. data/lib/devise/failure_app.rb +116 -36
  35. data/lib/devise/hooks/activatable.rb +5 -4
  36. data/lib/devise/hooks/csrf_cleaner.rb +5 -1
  37. data/lib/devise/hooks/forgetable.rb +2 -0
  38. data/lib/devise/hooks/lockable.rb +6 -1
  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 +15 -8
  42. data/lib/devise/hooks/trackable.rb +2 -0
  43. data/lib/devise/mailers/helpers.rb +7 -4
  44. data/lib/devise/mapping.rb +8 -2
  45. data/lib/devise/models/authenticatable.rb +76 -51
  46. data/lib/devise/models/confirmable.rb +129 -34
  47. data/lib/devise/models/database_authenticatable.rb +107 -30
  48. data/lib/devise/models/lockable.rb +19 -9
  49. data/lib/devise/models/omniauthable.rb +2 -0
  50. data/lib/devise/models/recoverable.rb +62 -26
  51. data/lib/devise/models/registerable.rb +4 -0
  52. data/lib/devise/models/rememberable.rb +58 -29
  53. data/lib/devise/models/timeoutable.rb +2 -6
  54. data/lib/devise/models/trackable.rb +20 -4
  55. data/lib/devise/models/validatable.rb +12 -5
  56. data/lib/devise/models.rb +3 -1
  57. data/lib/devise/modules.rb +2 -0
  58. data/lib/devise/omniauth/config.rb +2 -0
  59. data/lib/devise/omniauth/url_helpers.rb +14 -5
  60. data/lib/devise/omniauth.rb +2 -0
  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/routes.rb +80 -61
  66. data/lib/devise/rails/warden_compat.rb +3 -10
  67. data/lib/devise/rails.rb +8 -17
  68. data/lib/devise/secret_key_finder.rb +27 -0
  69. data/lib/devise/strategies/authenticatable.rb +18 -7
  70. data/lib/devise/strategies/base.rb +2 -0
  71. data/lib/devise/strategies/database_authenticatable.rb +13 -5
  72. data/lib/devise/strategies/rememberable.rb +15 -3
  73. data/lib/devise/test/controller_helpers.rb +165 -0
  74. data/lib/devise/test/integration_helpers.rb +63 -0
  75. data/lib/devise/test_helpers.rb +7 -124
  76. data/lib/devise/time_inflector.rb +2 -0
  77. data/lib/devise/token_generator.rb +3 -41
  78. data/lib/devise/version.rb +3 -1
  79. data/lib/devise.rb +106 -79
  80. data/lib/generators/active_record/devise_generator.rb +44 -7
  81. data/lib/generators/active_record/templates/migration.rb +5 -3
  82. data/lib/generators/active_record/templates/migration_existing.rb +5 -3
  83. data/lib/generators/devise/controllers_generator.rb +46 -0
  84. data/lib/generators/devise/devise_generator.rb +4 -2
  85. data/lib/generators/devise/install_generator.rb +17 -0
  86. data/lib/generators/devise/orm_helpers.rb +10 -21
  87. data/lib/generators/devise/views_generator.rb +21 -11
  88. data/lib/generators/mongoid/devise_generator.rb +7 -5
  89. data/lib/generators/templates/README +2 -9
  90. data/lib/generators/templates/controllers/README +14 -0
  91. data/lib/generators/templates/controllers/confirmations_controller.rb +30 -0
  92. data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +30 -0
  93. data/lib/generators/templates/controllers/passwords_controller.rb +34 -0
  94. data/lib/generators/templates/controllers/registrations_controller.rb +62 -0
  95. data/lib/generators/templates/controllers/sessions_controller.rb +27 -0
  96. data/lib/generators/templates/controllers/unlocks_controller.rb +30 -0
  97. data/lib/generators/templates/devise.rb +69 -30
  98. data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
  99. data/lib/generators/templates/markerb/email_changed.markerb +7 -0
  100. data/lib/generators/templates/markerb/password_change.markerb +3 -0
  101. data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
  102. data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
  103. data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +5 -1
  104. data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
  105. data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
  106. data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
  107. data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
  108. data/lib/generators/templates/simple_form_for/sessions/new.html.erb +9 -4
  109. data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
  110. metadata +31 -259
  111. data/.gitignore +0 -11
  112. data/.travis.yml +0 -28
  113. data/.yardopts +0 -9
  114. data/CONTRIBUTING.md +0 -14
  115. data/Gemfile +0 -29
  116. data/Gemfile.lock +0 -160
  117. data/Rakefile +0 -35
  118. data/devise.gemspec +0 -27
  119. data/devise.png +0 -0
  120. data/gemfiles/Gemfile.rails-3.2-stable +0 -29
  121. data/gemfiles/Gemfile.rails-4.0-stable +0 -29
  122. data/gemfiles/Gemfile.rails-head +0 -29
  123. data/test/controllers/custom_strategy_test.rb +0 -62
  124. data/test/controllers/helpers_test.rb +0 -276
  125. data/test/controllers/internal_helpers_test.rb +0 -123
  126. data/test/controllers/passwords_controller_test.rb +0 -31
  127. data/test/controllers/sessions_controller_test.rb +0 -103
  128. data/test/controllers/url_helpers_test.rb +0 -59
  129. data/test/delegator_test.rb +0 -19
  130. data/test/devise_test.rb +0 -94
  131. data/test/failure_app_test.rb +0 -232
  132. data/test/generators/active_record_generator_test.rb +0 -103
  133. data/test/generators/devise_generator_test.rb +0 -39
  134. data/test/generators/install_generator_test.rb +0 -13
  135. data/test/generators/mongoid_generator_test.rb +0 -23
  136. data/test/generators/views_generator_test.rb +0 -96
  137. data/test/helpers/devise_helper_test.rb +0 -51
  138. data/test/integration/authenticatable_test.rb +0 -713
  139. data/test/integration/confirmable_test.rb +0 -284
  140. data/test/integration/database_authenticatable_test.rb +0 -84
  141. data/test/integration/http_authenticatable_test.rb +0 -105
  142. data/test/integration/lockable_test.rb +0 -239
  143. data/test/integration/omniauthable_test.rb +0 -133
  144. data/test/integration/recoverable_test.rb +0 -334
  145. data/test/integration/registerable_test.rb +0 -349
  146. data/test/integration/rememberable_test.rb +0 -167
  147. data/test/integration/timeoutable_test.rb +0 -183
  148. data/test/integration/trackable_test.rb +0 -92
  149. data/test/mailers/confirmation_instructions_test.rb +0 -115
  150. data/test/mailers/reset_password_instructions_test.rb +0 -96
  151. data/test/mailers/unlock_instructions_test.rb +0 -91
  152. data/test/mapping_test.rb +0 -127
  153. data/test/models/authenticatable_test.rb +0 -13
  154. data/test/models/confirmable_test.rb +0 -454
  155. data/test/models/database_authenticatable_test.rb +0 -249
  156. data/test/models/lockable_test.rb +0 -316
  157. data/test/models/omniauthable_test.rb +0 -7
  158. data/test/models/recoverable_test.rb +0 -184
  159. data/test/models/registerable_test.rb +0 -7
  160. data/test/models/rememberable_test.rb +0 -183
  161. data/test/models/serializable_test.rb +0 -49
  162. data/test/models/timeoutable_test.rb +0 -51
  163. data/test/models/trackable_test.rb +0 -13
  164. data/test/models/validatable_test.rb +0 -127
  165. data/test/models_test.rb +0 -144
  166. data/test/omniauth/config_test.rb +0 -57
  167. data/test/omniauth/url_helpers_test.rb +0 -54
  168. data/test/orm/active_record.rb +0 -10
  169. data/test/orm/mongoid.rb +0 -13
  170. data/test/parameter_sanitizer_test.rb +0 -81
  171. data/test/rails_app/Rakefile +0 -6
  172. data/test/rails_app/app/active_record/admin.rb +0 -6
  173. data/test/rails_app/app/active_record/shim.rb +0 -2
  174. data/test/rails_app/app/active_record/user.rb +0 -6
  175. data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
  176. data/test/rails_app/app/controllers/admins_controller.rb +0 -11
  177. data/test/rails_app/app/controllers/application_controller.rb +0 -9
  178. data/test/rails_app/app/controllers/home_controller.rb +0 -25
  179. data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
  180. data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
  181. data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
  182. data/test/rails_app/app/controllers/users_controller.rb +0 -31
  183. data/test/rails_app/app/helpers/application_helper.rb +0 -3
  184. data/test/rails_app/app/mailers/users/mailer.rb +0 -12
  185. data/test/rails_app/app/mongoid/admin.rb +0 -29
  186. data/test/rails_app/app/mongoid/shim.rb +0 -23
  187. data/test/rails_app/app/mongoid/user.rb +0 -39
  188. data/test/rails_app/app/views/admins/index.html.erb +0 -1
  189. data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
  190. data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
  191. data/test/rails_app/app/views/home/index.html.erb +0 -1
  192. data/test/rails_app/app/views/home/join.html.erb +0 -1
  193. data/test/rails_app/app/views/home/private.html.erb +0 -1
  194. data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
  195. data/test/rails_app/app/views/layouts/application.html.erb +0 -24
  196. data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
  197. data/test/rails_app/app/views/users/index.html.erb +0 -1
  198. data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
  199. data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
  200. data/test/rails_app/bin/bundle +0 -3
  201. data/test/rails_app/bin/rails +0 -4
  202. data/test/rails_app/bin/rake +0 -4
  203. data/test/rails_app/config/application.rb +0 -40
  204. data/test/rails_app/config/boot.rb +0 -14
  205. data/test/rails_app/config/database.yml +0 -18
  206. data/test/rails_app/config/environment.rb +0 -5
  207. data/test/rails_app/config/environments/development.rb +0 -30
  208. data/test/rails_app/config/environments/production.rb +0 -80
  209. data/test/rails_app/config/environments/test.rb +0 -36
  210. data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
  211. data/test/rails_app/config/initializers/devise.rb +0 -181
  212. data/test/rails_app/config/initializers/inflections.rb +0 -2
  213. data/test/rails_app/config/initializers/secret_token.rb +0 -8
  214. data/test/rails_app/config/initializers/session_store.rb +0 -1
  215. data/test/rails_app/config/routes.rb +0 -105
  216. data/test/rails_app/config.ru +0 -4
  217. data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
  218. data/test/rails_app/db/schema.rb +0 -55
  219. data/test/rails_app/lib/shared_admin.rb +0 -17
  220. data/test/rails_app/lib/shared_user.rb +0 -29
  221. data/test/rails_app/public/404.html +0 -26
  222. data/test/rails_app/public/422.html +0 -26
  223. data/test/rails_app/public/500.html +0 -26
  224. data/test/rails_app/public/favicon.ico +0 -0
  225. data/test/routes_test.rb +0 -262
  226. data/test/support/action_controller/record_identifier.rb +0 -10
  227. data/test/support/assertions.rb +0 -40
  228. data/test/support/helpers.rb +0 -70
  229. data/test/support/integration.rb +0 -92
  230. data/test/support/locale/en.yml +0 -8
  231. data/test/support/mongoid.yml +0 -6
  232. data/test/support/webrat/integrations/rails.rb +0 -24
  233. data/test/test_helper.rb +0 -27
  234. data/test/test_helpers_test.rb +0 -173
  235. data/test/test_models.rb +0 -33
@@ -1,55 +0,0 @@
1
- # encoding: UTF-8
2
- # This file is auto-generated from the current state of the database. Instead
3
- # of editing this file, please use the migrations feature of Active Record to
4
- # incrementally modify your database, and then regenerate this schema definition.
5
- #
6
- # Note that this schema.rb definition is the authoritative source for your
7
- # database schema. If you need to create the application database on another
8
- # system, you should be using db:schema:load, not running all the migrations
9
- # from scratch. The latter is a flawed and unsustainable approach (the more migrations
10
- # you'll amass, the slower it'll run and the greater likelihood for issues).
11
- #
12
- # It's strongly recommended that you check this file into your version control system.
13
-
14
- ActiveRecord::Schema.define(version: 20100401102949) do
15
-
16
- create_table "admins", force: true do |t|
17
- t.string "email"
18
- t.string "encrypted_password"
19
- t.string "reset_password_token"
20
- t.datetime "reset_password_sent_at"
21
- t.datetime "remember_created_at"
22
- t.string "confirmation_token"
23
- t.datetime "confirmed_at"
24
- t.datetime "confirmation_sent_at"
25
- t.string "unconfirmed_email"
26
- t.datetime "locked_at"
27
- t.boolean "active", default: false
28
- t.datetime "created_at"
29
- t.datetime "updated_at"
30
- end
31
-
32
- create_table "users", force: true do |t|
33
- t.string "username"
34
- t.string "facebook_token"
35
- t.string "email", default: "", null: false
36
- t.string "encrypted_password", default: "", null: false
37
- t.string "reset_password_token"
38
- t.datetime "reset_password_sent_at"
39
- t.datetime "remember_created_at"
40
- t.integer "sign_in_count", default: 0
41
- t.datetime "current_sign_in_at"
42
- t.datetime "last_sign_in_at"
43
- t.string "current_sign_in_ip"
44
- t.string "last_sign_in_ip"
45
- t.string "confirmation_token"
46
- t.datetime "confirmed_at"
47
- t.datetime "confirmation_sent_at"
48
- t.integer "failed_attempts", default: 0
49
- t.string "unlock_token"
50
- t.datetime "locked_at"
51
- t.datetime "created_at"
52
- t.datetime "updated_at"
53
- end
54
-
55
- end
@@ -1,17 +0,0 @@
1
- module SharedAdmin
2
- extend ActiveSupport::Concern
3
-
4
- included do
5
- devise :database_authenticatable, :registerable,
6
- :timeoutable, :recoverable, :lockable, :confirmable,
7
- unlock_strategy: :time, lock_strategy: :none,
8
- allow_unconfirmed_access_for: 2.weeks, reconfirmable: true
9
-
10
- validates_length_of :reset_password_token, minimum: 3, allow_blank: true
11
- validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
12
- end
13
-
14
- def raw_confirmation_token
15
- @raw_confirmation_token
16
- end
17
- end
@@ -1,29 +0,0 @@
1
- module SharedUser
2
- extend ActiveSupport::Concern
3
-
4
- included do
5
- devise :database_authenticatable, :confirmable, :lockable, :recoverable,
6
- :registerable, :rememberable, :timeoutable,
7
- :trackable, :validatable, :omniauthable
8
-
9
- attr_accessor :other_key
10
-
11
- # They need to be included after Devise is called.
12
- extend ExtendMethods
13
- end
14
-
15
- def raw_confirmation_token
16
- @raw_confirmation_token
17
- end
18
-
19
- module ExtendMethods
20
- def new_with_session(params, session)
21
- super.tap do |user|
22
- if data = session["devise.facebook_data"]
23
- user.email = data["email"]
24
- user.confirmed_at = Time.now
25
- end
26
- end
27
- end
28
- end
29
- end
@@ -1,26 +0,0 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <title>The page you were looking for doesn't exist (404)</title>
5
- <style type="text/css">
6
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
7
- div.dialog {
8
- width: 25em;
9
- padding: 0 4em;
10
- margin: 4em auto 0 auto;
11
- border: 1px solid #ccc;
12
- border-right-color: #999;
13
- border-bottom-color: #999;
14
- }
15
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
16
- </style>
17
- </head>
18
-
19
- <body>
20
- <!-- This file lives in public/404.html -->
21
- <div class="dialog">
22
- <h1>The page you were looking for doesn't exist.</h1>
23
- <p>You may have mistyped the address or the page may have moved.</p>
24
- </div>
25
- </body>
26
- </html>
@@ -1,26 +0,0 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <title>The change you wanted was rejected (422)</title>
5
- <style type="text/css">
6
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
7
- div.dialog {
8
- width: 25em;
9
- padding: 0 4em;
10
- margin: 4em auto 0 auto;
11
- border: 1px solid #ccc;
12
- border-right-color: #999;
13
- border-bottom-color: #999;
14
- }
15
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
16
- </style>
17
- </head>
18
-
19
- <body>
20
- <!-- This file lives in public/422.html -->
21
- <div class="dialog">
22
- <h1>The change you wanted was rejected.</h1>
23
- <p>Maybe you tried to change something you didn't have access to.</p>
24
- </div>
25
- </body>
26
- </html>
@@ -1,26 +0,0 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <title>We're sorry, but something went wrong (500)</title>
5
- <style type="text/css">
6
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
7
- div.dialog {
8
- width: 25em;
9
- padding: 0 4em;
10
- margin: 4em auto 0 auto;
11
- border: 1px solid #ccc;
12
- border-right-color: #999;
13
- border-bottom-color: #999;
14
- }
15
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
16
- </style>
17
- </head>
18
-
19
- <body>
20
- <!-- This file lives in public/500.html -->
21
- <div class="dialog">
22
- <h1>We're sorry, but something went wrong.</h1>
23
- <p>We've been notified about this issue and we'll take a look at it shortly.</p>
24
- </div>
25
- </body>
26
- </html>
File without changes
data/test/routes_test.rb DELETED
@@ -1,262 +0,0 @@
1
- require 'test_helper'
2
-
3
- ExpectedRoutingError = Devise.rails4? ? MiniTest::Assertion : ActionController::RoutingError
4
-
5
- class DefaultRoutingTest < ActionController::TestCase
6
- test 'map new user session' do
7
- assert_recognizes({controller: 'devise/sessions', action: 'new'}, {path: 'users/sign_in', method: :get})
8
- assert_named_route "/users/sign_in", :new_user_session_path
9
- end
10
-
11
- test 'map create user session' do
12
- assert_recognizes({controller: 'devise/sessions', action: 'create'}, {path: 'users/sign_in', method: :post})
13
- assert_named_route "/users/sign_in", :user_session_path
14
- end
15
-
16
- test 'map destroy user session' do
17
- assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: 'users/sign_out', method: :get})
18
- assert_named_route "/users/sign_out", :destroy_user_session_path
19
- end
20
-
21
- test 'map new user confirmation' do
22
- assert_recognizes({controller: 'devise/confirmations', action: 'new'}, 'users/confirmation/new')
23
- assert_named_route "/users/confirmation/new", :new_user_confirmation_path
24
- end
25
-
26
- test 'map create user confirmation' do
27
- assert_recognizes({controller: 'devise/confirmations', action: 'create'}, {path: 'users/confirmation', method: :post})
28
- assert_named_route "/users/confirmation", :user_confirmation_path
29
- end
30
-
31
- test 'map show user confirmation' do
32
- assert_recognizes({controller: 'devise/confirmations', action: 'show'}, {path: 'users/confirmation', method: :get})
33
- end
34
-
35
- test 'map new user password' do
36
- assert_recognizes({controller: 'devise/passwords', action: 'new'}, 'users/password/new')
37
- assert_named_route "/users/password/new", :new_user_password_path
38
- end
39
-
40
- test 'map create user password' do
41
- assert_recognizes({controller: 'devise/passwords', action: 'create'}, {path: 'users/password', method: :post})
42
- assert_named_route "/users/password", :user_password_path
43
- end
44
-
45
- test 'map edit user password' do
46
- assert_recognizes({controller: 'devise/passwords', action: 'edit'}, 'users/password/edit')
47
- assert_named_route "/users/password/edit", :edit_user_password_path
48
- end
49
-
50
- test 'map update user password' do
51
- assert_recognizes({controller: 'devise/passwords', action: 'update'}, {path: 'users/password', method: :put})
52
- end
53
-
54
- test 'map new user unlock' do
55
- assert_recognizes({controller: 'devise/unlocks', action: 'new'}, 'users/unlock/new')
56
- assert_named_route "/users/unlock/new", :new_user_unlock_path
57
- end
58
-
59
- test 'map create user unlock' do
60
- assert_recognizes({controller: 'devise/unlocks', action: 'create'}, {path: 'users/unlock', method: :post})
61
- assert_named_route "/users/unlock", :user_unlock_path
62
- end
63
-
64
- test 'map show user unlock' do
65
- assert_recognizes({controller: 'devise/unlocks', action: 'show'}, {path: 'users/unlock', method: :get})
66
- end
67
-
68
- test 'map new user registration' do
69
- assert_recognizes({controller: 'devise/registrations', action: 'new'}, 'users/sign_up')
70
- assert_named_route "/users/sign_up", :new_user_registration_path
71
- end
72
-
73
- test 'map create user registration' do
74
- assert_recognizes({controller: 'devise/registrations', action: 'create'}, {path: 'users', method: :post})
75
- assert_named_route "/users", :user_registration_path
76
- end
77
-
78
- test 'map edit user registration' do
79
- assert_recognizes({controller: 'devise/registrations', action: 'edit'}, {path: 'users/edit', method: :get})
80
- assert_named_route "/users/edit", :edit_user_registration_path
81
- end
82
-
83
- test 'map update user registration' do
84
- assert_recognizes({controller: 'devise/registrations', action: 'update'}, {path: 'users', method: :put})
85
- end
86
-
87
- test 'map destroy user registration' do
88
- assert_recognizes({controller: 'devise/registrations', action: 'destroy'}, {path: 'users', method: :delete})
89
- end
90
-
91
- test 'map cancel user registration' do
92
- assert_recognizes({controller: 'devise/registrations', action: 'cancel'}, {path: 'users/cancel', method: :get})
93
- assert_named_route "/users/cancel", :cancel_user_registration_path
94
- end
95
-
96
- test 'map omniauth callbacks' do
97
- assert_recognizes({controller: 'users/omniauth_callbacks', action: 'facebook'}, {path: 'users/auth/facebook/callback', method: :get})
98
- assert_recognizes({controller: 'users/omniauth_callbacks', action: 'facebook'}, {path: 'users/auth/facebook/callback', method: :post})
99
- assert_named_route "/users/auth/facebook/callback", :user_omniauth_callback_path, :facebook
100
-
101
- # named open_id
102
- assert_recognizes({controller: 'users/omniauth_callbacks', action: 'google'}, {path: 'users/auth/google/callback', method: :get})
103
- assert_recognizes({controller: 'users/omniauth_callbacks', action: 'google'}, {path: 'users/auth/google/callback', method: :post})
104
- assert_named_route "/users/auth/google/callback", :user_omniauth_callback_path, :google
105
-
106
- assert_raise ExpectedRoutingError do
107
- assert_recognizes({controller: 'ysers/omniauth_callbacks', action: 'twitter'}, {path: 'users/auth/twitter/callback', method: :get})
108
- end
109
- end
110
-
111
- protected
112
-
113
- def assert_named_route(result, *args)
114
- assert_equal result, @routes.url_helpers.send(*args)
115
- end
116
- end
117
-
118
- class CustomizedRoutingTest < ActionController::TestCase
119
- test 'map admin with :path option' do
120
- assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'admin_area/sign_up', method: :get})
121
- end
122
-
123
- test 'map admin with :controllers option' do
124
- assert_recognizes({controller: 'admins/sessions', action: 'new'}, {path: 'admin_area/sign_in', method: :get})
125
- end
126
-
127
- test 'does not map admin password' do
128
- assert_raise ExpectedRoutingError do
129
- assert_recognizes({controller: 'devise/passwords', action: 'new'}, 'admin_area/password/new')
130
- end
131
- end
132
-
133
- test 'subdomain admin' do
134
- assert_recognizes({"host"=>"sub.example.com", controller: 'devise/sessions', action: 'new'}, {host: "sub.example.com", path: '/sub_admin/sign_in', method: :get})
135
- end
136
-
137
- test 'does only map reader password' do
138
- assert_raise ExpectedRoutingError do
139
- assert_recognizes({controller: 'devise/sessions', action: 'new'}, 'reader/sessions/new')
140
- end
141
- assert_recognizes({controller: 'devise/passwords', action: 'new'}, 'reader/password/new')
142
- end
143
-
144
- test 'map account with custom path name for session sign in' do
145
- assert_recognizes({controller: 'devise/sessions', action: 'new', locale: 'en'}, '/en/accounts/login')
146
- end
147
-
148
- test 'map account with custom path name for session sign out' do
149
- assert_recognizes({controller: 'devise/sessions', action: 'destroy', locale: 'en'}, '/en/accounts/logout')
150
- end
151
-
152
- test 'map account with custom path name for password' do
153
- assert_recognizes({controller: 'devise/passwords', action: 'new', locale: 'en'}, '/en/accounts/secret/new')
154
- end
155
-
156
- test 'map account with custom path name for registration' do
157
- assert_recognizes({controller: 'devise/registrations', action: 'new', locale: 'en'}, '/en/accounts/management/register')
158
- end
159
-
160
- test 'map account with custom path name for edit registration' do
161
- assert_recognizes({controller: 'devise/registrations', action: 'edit', locale: 'en'}, '/en/accounts/management/edit/profile')
162
- end
163
-
164
- test 'map account with custom path name for cancel registration' do
165
- assert_recognizes({controller: 'devise/registrations', action: 'cancel', locale: 'en'}, '/en/accounts/management/giveup')
166
- end
167
-
168
- test 'map deletes with :sign_out_via option' do
169
- assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/deletes/sign_out', method: :delete})
170
- assert_raise ExpectedRoutingError do
171
- assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/deletes/sign_out', method: :get})
172
- end
173
- end
174
-
175
- test 'map posts with :sign_out_via option' do
176
- assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/posts/sign_out', method: :post})
177
- assert_raise ExpectedRoutingError do
178
- assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/posts/sign_out', method: :get})
179
- end
180
- end
181
-
182
- test 'map delete_or_posts with :sign_out_via option' do
183
- assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/delete_or_posts/sign_out', method: :post})
184
- assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/delete_or_posts/sign_out', method: :delete})
185
- assert_raise ExpectedRoutingError do
186
- assert_recognizes({controller: 'devise/sessions', action: 'destroy'}, {path: '/sign_out_via/delete_or_posts/sign_out', method: :get})
187
- end
188
- end
189
-
190
- test 'map with constraints defined in hash' do
191
- assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://192.168.1.100/headquarters/sign_up', method: :get})
192
- assert_raise ExpectedRoutingError do
193
- assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://10.0.0.100/headquarters/sign_up', method: :get})
194
- end
195
- end
196
-
197
- test 'map with constraints defined in block' do
198
- assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://192.168.1.100/homebase/sign_up', method: :get})
199
- assert_raise ExpectedRoutingError do
200
- assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: 'http://10.0.0.100//homebase/sign_up', method: :get})
201
- end
202
- end
203
-
204
- test 'map with format false for sessions' do
205
- assert_recognizes({controller: 'devise/sessions', action: 'new'}, {path: '/htmlonly_admin/sign_in', method: :get})
206
- assert_raise ExpectedRoutingError do
207
- assert_recognizes({controller: 'devise/sessions', action: 'new'}, {path: '/htmlonly_admin/sign_in.xml', method: :get})
208
- end
209
- end
210
-
211
- test 'map with format false for passwords' do
212
- assert_recognizes({controller: 'devise/passwords', action: 'create'}, {path: '/htmlonly_admin/password', method: :post})
213
- assert_raise ExpectedRoutingError do
214
- assert_recognizes({controller: 'devise/passwords', action: 'create'}, {path: '/htmlonly_admin/password.xml', method: :post})
215
- end
216
- end
217
-
218
- test 'map with format false for registrations' do
219
- assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: '/htmlonly_admin/sign_up', method: :get})
220
- assert_raise ExpectedRoutingError do
221
- assert_recognizes({controller: 'devise/registrations', action: 'new'}, {path: '/htmlonly_admin/sign_up.xml', method: :get})
222
- end
223
- end
224
-
225
- test 'map with format false for confirmations' do
226
- assert_recognizes({controller: 'devise/confirmations', action: 'show'}, {path: '/htmlonly_users/confirmation', method: :get})
227
- assert_raise ExpectedRoutingError do
228
- assert_recognizes({controller: 'devise/confirmations', action: 'show'}, {path: '/htmlonly_users/confirmation.xml', method: :get})
229
- end
230
- end
231
-
232
- test 'map with format false for unlocks' do
233
- assert_recognizes({controller: 'devise/unlocks', action: 'show'}, {path: '/htmlonly_users/unlock', method: :get})
234
- assert_raise ExpectedRoutingError do
235
- assert_recognizes({controller: 'devise/unlocks', action: 'show'}, {path: '/htmlonly_users/unlock.xml', method: :get})
236
- end
237
- end
238
-
239
- test 'map with format false is not permanent' do
240
- assert_equal "/set.xml", @routes.url_helpers.set_path(:xml)
241
- end
242
-
243
- test 'checks if mapping has proper configuration for omniauth callback' do
244
- assert_raise ArgumentError do
245
- @routes.dup.eval_block do
246
- devise_for :admin, controllers: {omniauth_callbacks: "users/omniauth_callbacks"}
247
- end
248
- end
249
- end
250
- end
251
-
252
- class ScopedRoutingTest < ActionController::TestCase
253
- test 'map publisher account' do
254
- assert_recognizes({controller: 'publisher/registrations', action: 'new'}, {path: '/publisher/accounts/sign_up', method: :get})
255
- assert_equal '/publisher/accounts/sign_up', @routes.url_helpers.new_publisher_account_registration_path
256
- end
257
-
258
- test 'map publisher account merges path names' do
259
- assert_recognizes({controller: 'publisher/sessions', action: 'new'}, {path: '/publisher/accounts/get_in', method: :get})
260
- assert_equal '/publisher/accounts/get_in', @routes.url_helpers.new_publisher_account_session_path
261
- end
262
- end
@@ -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,40 +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_not_blank(assertion)
13
- assert !assertion.blank?
14
- end
15
- alias :assert_present :assert_not_blank
16
-
17
- def assert_email_sent(address = nil, &block)
18
- assert_difference('ActionMailer::Base.deliveries.size', &block)
19
- if address.present?
20
- assert_equal address, ActionMailer::Base.deliveries.last['to'].to_s
21
- end
22
- end
23
-
24
- def assert_email_not_sent(&block)
25
- assert_no_difference('ActionMailer::Base.deliveries.size', &block)
26
- end
27
-
28
- def assert_same_content(result, expected)
29
- assert expected.size == result.size, "the arrays doesn't have the same size"
30
- expected.each do |element|
31
- assert result.include?(element), "The array doesn't include '#{element}'."
32
- end
33
- end
34
-
35
- def assert_raise_with_message(exception_klass, message, &block)
36
- exception = assert_raise exception_klass, &block
37
- assert_equal exception.message, message,
38
- "The expected message was #{message} but your exception throwed #{exception.message}"
39
- end
40
- end
@@ -1,70 +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
- begin
12
- I18n.backend.store_translations(locale, translations)
13
- yield
14
- ensure
15
- I18n.reload!
16
- end
17
- end
18
-
19
- def generate_unique_email
20
- @@email_count ||= 0
21
- @@email_count += 1
22
- "test#{@@email_count}@example.com"
23
- end
24
-
25
- def valid_attributes(attributes={})
26
- { username: "usertest",
27
- email: generate_unique_email,
28
- password: '12345678',
29
- password_confirmation: '12345678' }.update(attributes)
30
- end
31
-
32
- def new_user(attributes={})
33
- User.new(valid_attributes(attributes))
34
- end
35
-
36
- def create_user(attributes={})
37
- User.create!(valid_attributes(attributes))
38
- end
39
-
40
- def create_admin(attributes={})
41
- valid_attributes = valid_attributes(attributes)
42
- valid_attributes.delete(:username)
43
- Admin.create!(valid_attributes)
44
- end
45
-
46
- # Execute the block setting the given values and restoring old values after
47
- # the block is executed.
48
- def swap(object, new_values)
49
- old_values = {}
50
- new_values.each do |key, value|
51
- old_values[key] = object.send key
52
- object.send :"#{key}=", value
53
- end
54
- clear_cached_variables(new_values)
55
- yield
56
- ensure
57
- clear_cached_variables(new_values)
58
- old_values.each do |key, value|
59
- object.send :"#{key}=", value
60
- end
61
- end
62
-
63
- def clear_cached_variables(options)
64
- if options.key?(:case_insensitive_keys) || options.key?(:strip_whitespace_keys)
65
- Devise.mappings.each do |_, mapping|
66
- mapping.to.instance_variable_set(:@devise_parameter_filter, nil)
67
- end
68
- end
69
- end
70
- 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 'Sign 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 'Sign 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"