devise 3.2.3 → 3.2.4

data/test/generators/active_record_generator_test.rb

@@ -30,10 +30,10 @@ if DEVISE_ORM == :active_record
       run_generator %w(monster)
       assert_migration "db/migrate/devise_create_monsters.rb"
       assert_migration "db/migrate/add_devise_to_monsters.rb"
-      run_generator %w(monster), :behavior => :revoke
+      run_generator %w(monster), behavior: :revoke
       assert_no_migration "db/migrate/add_devise_to_monsters.rb"
       assert_migration "db/migrate/devise_create_monsters.rb"
-      run_generator %w(monster), :behavior => :revoke
+      run_generator %w(monster), behavior: :revoke
       assert_no_file "app/models/monster.rb"
       assert_no_migration "db/migrate/devise_create_monsters.rb"
     end
@@ -47,11 +47,11 @@ if DEVISE_ORM == :active_record
 
   def simulate_inside_engine(engine, namespace)
     if Rails::Generators.respond_to?(:namespace=)
-      swap Rails::Generators, :namespace => namespace do
+      swap Rails::Generators, namespace: namespace do
         yield
       end
     else
-      swap Rails, :application => engine.instance do
+      swap Rails, application: engine.instance do
         yield
       end
     end

data/test/generators/devise_generator_test.rb

@@ -18,13 +18,13 @@ class DeviseGeneratorTest < Rails::Generators::TestCase
 
   test "route generation for namespaced model names" do
     run_generator %w(monster/goblin name:string)
-    match = /devise_for :goblins, :class_name => "Monster::Goblin"/
+    match = /devise_for :goblins, class_name: "Monster::Goblin"/
     assert_file "config/routes.rb", match
   end
 
   test "route generation with skip routes" do
     run_generator %w(monster name:string --skip-routes)
-    match = /devise_for :monsters, :skip => :all/
+    match = /devise_for :monsters, skip: :all/
     assert_file "config/routes.rb", match
   end
 

data/test/generators/mongoid_generator_test.rb

@@ -15,7 +15,7 @@ if DEVISE_ORM == :mongoid
 
     test "all files are properly deleted" do
       run_generator %w(monster)
-      run_generator %w(monster), :behavior => :revoke
+      run_generator %w(monster), behavior: :revoke
       assert_no_file "app/models/monster.rb"
     end
   end

data/test/generators/views_generator_test.rb

@@ -33,7 +33,36 @@ class ViewsGeneratorTest < Rails::Generators::TestCase
 
   test "Assert views with markerb" do
     run_generator %w(--markerb)
-    assert_files nil, :mail_template_engine => "markerb"
+    assert_files nil, mail_template_engine: "markerb"
+  end
+
+
+  test "Assert only views within specified directories" do
+    run_generator %w(-v sessions registrations)
+    assert_file "app/views/devise/sessions/new.html.erb"
+    assert_file "app/views/devise/registrations/new.html.erb"
+    assert_file "app/views/devise/registrations/edit.html.erb"
+    assert_no_file "app/views/devise/confirmations/new.html.erb"
+    assert_no_file "app/views/devise/mailer/confirmation_instructions.html.erb"
+  end
+
+  test "Assert specified directories with scope" do
+    run_generator %w(users -v sessions)
+    assert_file "app/views/users/sessions/new.html.erb"
+    assert_no_file "app/views/users/confirmations/new.html.erb"
+  end
+
+  test "Assert specified directories with simple form" do
+    run_generator %w(-v registrations -b simple_form_for)
+    assert_file "app/views/devise/registrations/new.html.erb", /simple_form_for/
+    assert_no_file "app/views/devise/confirmations/new.html.erb"
+    end
+
+  test "Assert specified directories with markerb" do
+    run_generator %w(--markerb -v passwords mailer)
+    assert_file "app/views/devise/passwords/new.html.erb"
+    assert_no_file "app/views/devise/confirmations/new.html.erb"
+    assert_file "app/views/devise/mailer/reset_password_instructions.markerb"
   end
 
   def assert_files(scope = nil, options={})

data/test/helpers/devise_helper_test.rb

@@ -2,16 +2,16 @@ require 'test_helper'
 
 class DeviseHelperTest < ActionDispatch::IntegrationTest
   setup do
-    model_labels = { :models => { :user => "utilisateur" } }
+    model_labels = { models: { user: "utilisateur" } }
 
     I18n.backend.store_translations :fr,
     {
-      :errors => { :messages => { :not_saved => {
-        :one => "Erreur lors de l'enregistrement de '%{resource}': 1 erreur.",
-        :other => "Erreur lors de l'enregistrement de '%{resource}': %{count} erreurs."
+      errors: { messages: { not_saved: {
+        one: "Erreur lors de l'enregistrement de '%{resource}': 1 erreur.",
+        other: "Erreur lors de l'enregistrement de '%{resource}': %{count} erreurs."
       } } },
-      :activerecord => model_labels,
-      :mongoid => model_labels
+      activerecord: model_labels,
+      mongoid: model_labels
     }
 
     I18n.locale = 'fr'
@@ -24,8 +24,8 @@ class DeviseHelperTest < ActionDispatch::IntegrationTest
   test 'test errors.messages.not_saved with single error from i18n' do
     get new_user_registration_path
 
-    fill_in 'password', :with => 'new_user123'
-    fill_in 'password confirmation', :with => 'new_user123'
+    fill_in 'password', with: 'new_user123'
+    fill_in 'password confirmation', with: 'new_user123'
     click_button 'Sign up'
 
     assert_have_selector '#error_explanation'
@@ -39,9 +39,9 @@ class DeviseHelperTest < ActionDispatch::IntegrationTest
 
     get new_user_registration_path
 
-    fill_in 'email', :with => 'invalid_email'
-    fill_in 'password', :with => 'new_user123'
-    fill_in 'password confirmation', :with => 'new_user321'
+    fill_in 'email', with: 'invalid_email'
+    fill_in 'password', with: 'new_user123'
+    fill_in 'password confirmation', with: 'new_user321'
     click_button 'Sign up'
 
     assert_have_selector '#error_explanation'

data/test/integration/authenticatable_test.rb

@@ -27,7 +27,7 @@ class AuthenticationSanityTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign out as user should not touch admin authentication if sign_out_all_scopes is false' do
-    swap Devise, :sign_out_all_scopes => false do
+    swap Devise, sign_out_all_scopes: false do
       sign_in_as_user
       sign_in_as_admin
       get destroy_user_session_path
@@ -37,7 +37,7 @@ class AuthenticationSanityTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign out as admin should not touch user authentication if sign_out_all_scopes is false' do
-    swap Devise, :sign_out_all_scopes => false do
+    swap Devise, sign_out_all_scopes: false do
       sign_in_as_user
       sign_in_as_admin
 
@@ -48,7 +48,7 @@ class AuthenticationSanityTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign out as user should also sign out admin if sign_out_all_scopes is true' do
-    swap Devise, :sign_out_all_scopes => true do
+    swap Devise, sign_out_all_scopes: true do
       sign_in_as_user
       sign_in_as_admin
 
@@ -59,7 +59,7 @@ class AuthenticationSanityTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign out as admin should also sign out user if sign_out_all_scopes is true' do
-    swap Devise, :sign_out_all_scopes => true do
+    swap Devise, sign_out_all_scopes: true do
       sign_in_as_user
       sign_in_as_admin
 
@@ -162,7 +162,7 @@ class AuthenticationRoutesRestrictions < ActionDispatch::IntegrationTest
   end
 
   test 'signed in as inactive admin should not be able to access private/active route restricted to active admins (authenticate denied)' do
-    sign_in_as_admin(:active => false)
+    sign_in_as_admin(active: false)
     assert warden.authenticated?(:admin)
     assert_not warden.authenticated?(:user)
 
@@ -172,7 +172,7 @@ class AuthenticationRoutesRestrictions < ActionDispatch::IntegrationTest
   end
 
   test 'signed in as active admin should be able to access private/active route restricted to active admins (authenticate accepted)' do
-    sign_in_as_admin(:active => true)
+    sign_in_as_admin(active: true)
     assert warden.authenticated?(:admin)
     assert_not warden.authenticated?(:user)
 
@@ -214,7 +214,7 @@ class AuthenticationRoutesRestrictions < ActionDispatch::IntegrationTest
   end
 
   test 'signed in as inactive admin should not be able to access dashboard/active route restricted to active admins (authenticated denied)' do
-    sign_in_as_admin(:active => false)
+    sign_in_as_admin(active: false)
     assert warden.authenticated?(:admin)
     assert_not warden.authenticated?(:user)
 
@@ -224,7 +224,7 @@ class AuthenticationRoutesRestrictions < ActionDispatch::IntegrationTest
   end
 
   test 'signed in as active admin should be able to access dashboard/active route restricted to active admins (authenticated accepted)' do
-    sign_in_as_admin(:active => true)
+    sign_in_as_admin(active: true)
     assert warden.authenticated?(:admin)
     assert_not warden.authenticated?(:user)
 
@@ -277,7 +277,7 @@ class AuthenticationRedirectTest < ActionDispatch::IntegrationTest
     assert_equal users_path, session[:"user_return_to"]
 
     follow_redirect!
-    sign_in_as_user :visit => false
+    sign_in_as_user visit: false
 
     assert_current_url '/users'
     assert_nil session[:"user_return_to"]
@@ -293,7 +293,7 @@ class AuthenticationRedirectTest < ActionDispatch::IntegrationTest
     assert_equal users_path, session[:"user_return_to"]
 
     follow_redirect!
-    sign_in_as_user :visit => false
+    sign_in_as_user visit: false
 
     assert_current_url '/users'
     assert_nil session[:"user_return_to"]
@@ -392,7 +392,7 @@ end
 
 class AuthenticationWithScopedViewsTest < ActionDispatch::IntegrationTest
   test 'renders the scoped view if turned on and view is available' do
-    swap Devise, :scoped_views => true do
+    swap Devise, scoped_views: true do
       assert_raise Webrat::NotFoundError do
         sign_in_as_user
       end
@@ -415,7 +415,7 @@ class AuthenticationWithScopedViewsTest < ActionDispatch::IntegrationTest
   end
 
   test 'does not render the scoped view if turned off' do
-    swap Devise, :scoped_views => false do
+    swap Devise, scoped_views: false do
       assert_nothing_raised do
         sign_in_as_user
       end
@@ -423,7 +423,7 @@ class AuthenticationWithScopedViewsTest < ActionDispatch::IntegrationTest
   end
 
   test 'does not render the scoped view if not available' do
-    swap Devise, :scoped_views => true do
+    swap Devise, scoped_views: true do
       assert_nothing_raised do
         sign_in_as_admin
       end
@@ -433,7 +433,7 @@ end
 
 class AuthenticationOthersTest < ActionDispatch::IntegrationTest
   test 'handles unverified requests gets rid of caches' do
-    swap ApplicationController, :allow_forgery_protection => true do
+    swap ApplicationController, allow_forgery_protection: true do
       post exhibit_user_url(1)
       assert_not warden.authenticated?(:user)
 
@@ -473,12 +473,12 @@ class AuthenticationOthersTest < ActionDispatch::IntegrationTest
   test 'sign in with script name' do
     assert_nothing_raised do
       get new_user_session_path, {}, "SCRIPT_NAME" => "/omg"
-      fill_in "email", :with => "user@test.com"
+      fill_in "email", with: "user@test.com"
     end
   end
 
   test 'sign in stub in xml format' do
-    get new_user_session_path(:format => 'xml')
+    get new_user_session_path(format: 'xml')
     assert_match '<?xml version="1.0" encoding="UTF-8"?>', response.body
     assert_match /<user>.*<\/user>/m, response.body
     assert_match '<email></email>', response.body
@@ -486,15 +486,15 @@ class AuthenticationOthersTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign in stub in json format' do
-    get new_user_session_path(:format => 'json')
+    get new_user_session_path(format: 'json')
     assert_match '{"user":{', response.body
     assert_match '"email":""', response.body
     assert_match '"password":null', response.body
   end
 
   test 'sign in stub in json with non attribute key' do
-    swap Devise, :authentication_keys => [:other_key] do
-      get new_user_session_path(:format => 'json')
+    swap Devise, authentication_keys: [:other_key] do
+      get new_user_session_path(format: 'json')
       assert_match '{"user":{', response.body
       assert_match '"other_key":null', response.body
       assert_match '"password":null', response.body
@@ -502,30 +502,30 @@ class AuthenticationOthersTest < ActionDispatch::IntegrationTest
   end
 
   test 'uses the mapping from router' do
-    sign_in_as_user :visit => "/as/sign_in"
+    sign_in_as_user visit: "/as/sign_in"
     assert warden.authenticated?(:user)
     assert_not warden.authenticated?(:admin)
   end
 
   test 'sign in with xml format returns xml response' do
     create_user
-    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '12345678'}
+    post user_session_path(format: 'xml'), user: {email: "user@test.com", password: '12345678'}
     assert_response :success
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
   end
 
   test 'sign in with xml format is idempotent' do
-    get new_user_session_path(:format => 'xml')
+    get new_user_session_path(format: 'xml')
     assert_response :success
 
     create_user
-    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '12345678'}
+    post user_session_path(format: 'xml'), user: {email: "user@test.com", password: '12345678'}
     assert_response :success
 
-    get new_user_session_path(:format => 'xml')
+    get new_user_session_path(format: 'xml')
     assert_response :success
 
-    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '12345678'}
+    post user_session_path(format: 'xml'), user: {email: "user@test.com", password: '12345678'}
     assert_response :success
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
   end
@@ -537,27 +537,27 @@ class AuthenticationOthersTest < ActionDispatch::IntegrationTest
     assert_current_url '/'
 
     sign_in_as_user
-    get destroy_user_session_path(:format => 'html')
+    get destroy_user_session_path(format: 'html')
     assert_response :redirect
     assert_current_url '/'
   end
 
   test 'sign out with xml format returns no content' do
     sign_in_as_user
-    get destroy_user_session_path(:format => 'xml')
+    get destroy_user_session_path(format: 'xml')
     assert_response :no_content
     assert_not warden.authenticated?(:user)
   end
 
   test 'sign out with json format returns no content' do
     sign_in_as_user
-    get destroy_user_session_path(:format => 'json')
+    get destroy_user_session_path(format: 'json')
     assert_response :no_content
     assert_not warden.authenticated?(:user)
   end
 
   test 'sign out with non-navigational format via XHR does not redirect' do
-    swap Devise, :navigational_formats => ['*/*', :html] do
+    swap Devise, navigational_formats: ['*/*', :html] do
       sign_in_as_user
       xml_http_request :get, destroy_user_session_path, {}, { "HTTP_ACCEPT" => "application/json,text/javascript,*/*" } # NOTE: Bug is triggered by combination of XHR and */*.
       assert_response :no_content
@@ -567,7 +567,7 @@ class AuthenticationOthersTest < ActionDispatch::IntegrationTest
 
   # Belt and braces ... Perhaps this test is not necessary?
   test 'sign out with navigational format via XHR does redirect' do
-    swap Devise, :navigational_formats => ['*/*', :html] do
+    swap Devise, navigational_formats: ['*/*', :html] do
       sign_in_as_user
       xml_http_request :get, destroy_user_session_path, {}, { "HTTP_ACCEPT" => "text/html,*/*" }
       assert_response :redirect
@@ -578,7 +578,7 @@ end
 
 class AuthenticationKeysTest < ActionDispatch::IntegrationTest
   test 'missing authentication keys cause authentication to abort' do
-    swap Devise, :authentication_keys => [:subdomain] do
+    swap Devise, authentication_keys: [:subdomain] do
       sign_in_as_user
       assert_contain "Invalid email or password."
       assert_not warden.authenticated?(:user)
@@ -586,7 +586,7 @@ class AuthenticationKeysTest < ActionDispatch::IntegrationTest
   end
 
   test 'missing authentication keys cause authentication to abort unless marked as not required' do
-    swap Devise, :authentication_keys => { :email => true, :subdomain => false } do
+    swap Devise, authentication_keys: { email: true, subdomain: false } do
       sign_in_as_user
       assert warden.authenticated?(:user)
     end
@@ -597,15 +597,15 @@ class AuthenticationRequestKeysTest < ActionDispatch::IntegrationTest
   test 'request keys are used on authentication' do
     host! 'foo.bar.baz'
 
-    swap Devise, :request_keys => [:subdomain] do
-      User.expects(:find_for_authentication).with(:subdomain => 'foo', :email => 'user@test.com').returns(create_user)
+    swap Devise, request_keys: [:subdomain] do
+      User.expects(:find_for_authentication).with(subdomain: 'foo', email: 'user@test.com').returns(create_user)
       sign_in_as_user
       assert warden.authenticated?(:user)
     end
   end
 
   test 'invalid request keys raises NoMethodError' do
-    swap Devise, :request_keys => [:unknown_method] do
+    swap Devise, request_keys: [:unknown_method] do
       assert_raise NoMethodError do
         sign_in_as_user
       end
@@ -617,7 +617,7 @@ class AuthenticationRequestKeysTest < ActionDispatch::IntegrationTest
   test 'blank request keys cause authentication to abort' do
     host! 'test.com'
 
-    swap Devise, :request_keys => [:subdomain] do
+    swap Devise, request_keys: [:subdomain] do
       sign_in_as_user
       assert_contain "Invalid email or password."
       assert_not warden.authenticated?(:user)
@@ -627,7 +627,7 @@ class AuthenticationRequestKeysTest < ActionDispatch::IntegrationTest
   test 'blank request keys cause authentication to abort unless if marked as not required' do
     host! 'test.com'
 
-    swap Devise, :request_keys => { :subdomain => false } do
+    swap Devise, request_keys: { subdomain: false } do
       sign_in_as_user
       assert warden.authenticated?(:user)
     end
@@ -636,7 +636,7 @@ end
 
 class AuthenticationSignOutViaTest < ActionDispatch::IntegrationTest
   def sign_in!(scope)
-    sign_in_as_admin(:visit => send("new_#{scope}_session_path"))
+    sign_in_as_admin(visit: send("new_#{scope}_session_path"))
     assert warden.authenticated?(scope)
   end
 
@@ -692,22 +692,22 @@ end
 class DoubleAuthenticationRedirectTest < ActionDispatch::IntegrationTest
   test 'signed in as user redirects when visiting user sign in page' do
     sign_in_as_user
-    get new_user_session_path(:format => :html)
+    get new_user_session_path(format: :html)
     assert_redirected_to '/'
   end
 
   test 'signed in as admin redirects when visiting admin sign in page' do
     sign_in_as_admin
-    get new_admin_session_path(:format => :html)
+    get new_admin_session_path(format: :html)
     assert_redirected_to '/admin_area/home'
   end
 
   test 'signed in as both user and admin redirects when visiting admin sign in page' do
     sign_in_as_user
     sign_in_as_admin
-    get new_user_session_path(:format => :html)
+    get new_user_session_path(format: :html)
     assert_redirected_to '/'
-    get new_admin_session_path(:format => :html)
+    get new_admin_session_path(format: :html)
     assert_redirected_to '/admin_area/home'
   end
 end