devise 3.2.3 → 3.2.4

data/test/models/rememberable_test.rb

@@ -86,7 +86,7 @@ class RememberableTest < ActiveSupport::TestCase
   end
 
   test 'remember for should fallback to devise remember for default configuration' do
-    swap Devise, :remember_for => 1.day do
+    swap Devise, remember_for: 1.day do
       resource = create_resource
       resource.remember_me!
       assert_not resource.remember_expired?
@@ -94,7 +94,7 @@ class RememberableTest < ActiveSupport::TestCase
   end
 
   test 'remember expires at should sum date of creation with remember for configuration' do
-    swap Devise, :remember_for => 3.days do
+    swap Devise, remember_for: 3.days do
       resource = create_resource
       resource.remember_me!
       assert_equal 3.days.from_now.to_date, resource.remember_expires_at.to_date
@@ -105,7 +105,7 @@ class RememberableTest < ActiveSupport::TestCase
   end
 
   test 'remember should be expired if remember_for is zero' do
-    swap Devise, :remember_for => 0.days do
+    swap Devise, remember_for: 0.days do
       Devise.remember_for = 0.days
       resource = create_resource
       resource.remember_me!
@@ -114,7 +114,7 @@ class RememberableTest < ActiveSupport::TestCase
   end
 
   test 'remember should be expired if it was created before limit time' do
-    swap Devise, :remember_for => 1.day do
+    swap Devise, remember_for: 1.day do
       resource = create_resource
       resource.remember_me!
       resource.remember_created_at = 2.days.ago
@@ -124,7 +124,7 @@ class RememberableTest < ActiveSupport::TestCase
   end
 
   test 'remember should not be expired if it was created within the limit time' do
-    swap Devise, :remember_for => 30.days do
+    swap Devise, remember_for: 30.days do
       resource = create_resource
       resource.remember_me!
       resource.remember_created_at = (30.days.ago + 2.minutes)
@@ -134,7 +134,7 @@ class RememberableTest < ActiveSupport::TestCase
   end
 
   test 'if extend_remember_period is false, remember_me! should generate a new timestamp if expired' do
-    swap Devise, :remember_for => 5.minutes do
+    swap Devise, remember_for: 5.minutes do
       resource = create_resource
       resource.remember_me!(false)
       assert resource.remember_created_at
@@ -148,7 +148,7 @@ class RememberableTest < ActiveSupport::TestCase
   end
 
   test 'if extend_remember_period is false, remember_me! should not generate a new timestamp' do
-    swap Devise, :remember_for => 1.year do
+    swap Devise, remember_for: 1.year do
       resource = create_resource
       resource.remember_me!(false)
       assert resource.remember_created_at
@@ -162,7 +162,7 @@ class RememberableTest < ActiveSupport::TestCase
   end
 
   test 'if extend_remember_period is true, remember_me! should always generate a new timestamp' do
-    swap Devise, :remember_for => 1.year do
+    swap Devise, remember_for: 1.year do
       resource = create_resource
       resource.remember_me!(true)
       assert resource.remember_created_at

data/test/models/serializable_test.rb

@@ -11,13 +11,13 @@ class SerializableTest < ActiveSupport::TestCase
   end
 
   test 'should not include unsafe keys on XML even if a new except is provided' do
-    assert_no_match(/email/, @user.to_xml(:except => :email))
-    assert_no_match(/confirmation-token/, @user.to_xml(:except => :email))
+    assert_no_match(/email/, @user.to_xml(except: :email))
+    assert_no_match(/confirmation-token/, @user.to_xml(except: :email))
   end
 
   test 'should include unsafe keys on XML if a force_except is provided' do
-    assert_no_match(/<email/, @user.to_xml(:force_except => :email))
-    assert_match(/confirmation-token/, @user.to_xml(:force_except => :email))
+    assert_no_match(/<email/, @user.to_xml(force_except: :email))
+    assert_match(/confirmation-token/, @user.to_xml(force_except: :email))
   end
 
   test 'should not include unsafe keys on JSON' do
@@ -26,13 +26,13 @@ class SerializableTest < ActiveSupport::TestCase
   end
 
   test 'should not include unsafe keys on JSON even if a new except is provided' do
-    assert_no_key "email", from_json(:except => :email)
-    assert_no_key "confirmation_token", from_json(:except => :email)
+    assert_no_key "email", from_json(except: :email)
+    assert_no_key "confirmation_token", from_json(except: :email)
   end
 
   test 'should include unsafe keys on JSON if a force_except is provided' do
-    assert_no_key "email", from_json(:force_except => :email)
-    assert_key "confirmation_token", from_json(:force_except => :email)
+    assert_no_key "email", from_json(force_except: :email)
+    assert_key "confirmation_token", from_json(force_except: :email)
   end
 
   def assert_key(key, subject)

data/test/models/timeoutable_test.rb

@@ -29,7 +29,7 @@ class TimeoutableTest < ActiveSupport::TestCase
   end
 
   test 'fallback to Devise config option' do
-    swap Devise, :timeout_in => 1.minute do
+    swap Devise, timeout_in: 1.minute do
       user = new_user
       assert user.timedout?(2.minutes.ago)
       assert_not user.timedout?(30.seconds.ago)

data/test/models/validatable_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 class ValidatableTest < ActiveSupport::TestCase
   test 'should require email to be set' do
-    user = new_user(:email => nil)
+    user = new_user(email: nil)
     assert user.invalid?
     assert user.errors[:email]
     assert_equal 'can\'t be blank', user.errors[:email].join
@@ -12,7 +12,7 @@ class ValidatableTest < ActiveSupport::TestCase
   test 'should require uniqueness of email if email has changed, allowing blank' do
     existing_user = create_user
 
-    user = new_user(:email => '')
+    user = new_user(email: '')
     assert user.invalid?
     assert_no_match(/taken/, user.errors[:email].join)
 
@@ -20,12 +20,12 @@ class ValidatableTest < ActiveSupport::TestCase
     assert user.invalid?
     assert_match(/taken/, user.errors[:email].join)
 
-    user.save(:validate => false)
+    user.save(validate: false)
     assert user.valid?
   end
 
   test 'should require correct email format if email has changed, allowing blank' do
-    user = new_user(:email => '')
+    user = new_user(email: '')
     assert user.invalid?
     assert_not_equal 'is invalid', user.errors[:email].join
 
@@ -35,26 +35,26 @@ class ValidatableTest < ActiveSupport::TestCase
       assert_equal 'is invalid', user.errors[:email].join
     end
 
-    user.save(:validate => false)
+    user.save(validate: false)
     assert user.valid?
   end
 
   test 'should accept valid emails' do
     %w(a.b.c@example.com test_mail@gmail.com any@any.net email@test.br 123@mail.test 1☃3@mail.test).each do |email|
-      user = new_user(:email => email)
+      user = new_user(email: email)
       assert user.valid?, 'should be valid with email ' << email
       assert_blank user.errors[:email]
     end
   end
 
   test 'should require password to be set when creating a new record' do
-    user = new_user(:password => '', :password_confirmation => '')
+    user = new_user(password: '', password_confirmation: '')
     assert user.invalid?
     assert_equal 'can\'t be blank', user.errors[:password].join
   end
 
   test 'should require confirmation to be set when creating a new record' do
-    user = new_user(:password => 'new_password', :password_confirmation => 'blabla')
+    user = new_user(password: 'new_password', password_confirmation: 'blabla')
     assert user.invalid?
 
     if Devise.rails4?
@@ -87,13 +87,13 @@ class ValidatableTest < ActiveSupport::TestCase
   end
 
   test 'should require a password with minimum of 6 characters' do
-    user = new_user(:password => '12345', :password_confirmation => '12345')
+    user = new_user(password: '12345', password_confirmation: '12345')
     assert user.invalid?
     assert_equal 'is too short (minimum is 6 characters)', user.errors[:password].join
   end
 
   test 'should require a password with maximum of 128 characters long' do
-    user = new_user(:password => 'x'*129, :password_confirmation => 'x'*129)
+    user = new_user(password: 'x'*129, password_confirmation: 'x'*129)
     assert user.invalid?
     assert_equal 'is too long (maximum is 128 characters)', user.errors[:password].join
   end
@@ -109,7 +109,7 @@ class ValidatableTest < ActiveSupport::TestCase
   end
 
   test 'should complain about length even if password is not required' do
-    user = new_user(:password => 'x'*129, :password_confirmation => 'x'*129)
+    user = new_user(password: 'x'*129, password_confirmation: 'x'*129)
     user.stubs(:password_required?).returns(false)
     assert user.invalid?
     assert_equal 'is too long (maximum is 128 characters)', user.errors[:password].join

data/test/omniauth/config_test.rb

@@ -11,12 +11,12 @@ class OmniAuthConfigTest < ActiveSupport::TestCase
   end
 
   test 'strategy_name returns provider if no name option are given' do
-    config = Devise::OmniAuth::Config.new :facebook, [{ :other => :option }]
+    config = Devise::OmniAuth::Config.new :facebook, [{ other: :option }]
     assert_equal :facebook, config.strategy_name
   end
 
   test 'returns name option when have a name' do
-    config = Devise::OmniAuth::Config.new :facebook, [{ :name => :github }]
+    config = Devise::OmniAuth::Config.new :facebook, [{ name: :github }]
     assert_equal :github, config.strategy_name
   end
 
@@ -50,7 +50,7 @@ class OmniAuthConfigTest < ActiveSupport::TestCase
   end
 
   test 'allows the user to define a custom require path' do
-    config = Devise::OmniAuth::Config.new :my_strategy, [{:strategy_class => MyStrategy}]
+    config = Devise::OmniAuth::Config.new :my_strategy, [{strategy_class: MyStrategy}]
     config_class = config.strategy_class
     assert_equal MyStrategy, config_class
   end

data/test/omniauth/url_helpers_test.rb

@@ -17,8 +17,8 @@ class OmniAuthRoutesTest < ActionController::TestCase
 
     if with_param
       # Default url params
-      assert_equal @controller.send(action, :user, provider, :param => 123),
-                   @controller.send("user_#{action}", provider, :param => 123)
+      assert_equal @controller.send(action, :user, provider, param: 123),
+                   @controller.send("user_#{action}", provider, param: 123)
     end
   end
 
@@ -44,7 +44,7 @@ class OmniAuthRoutesTest < ActionController::TestCase
 
   test 'should generate authorization path with params' do
     assert_match "/users/auth/openid?openid_url=http%3A%2F%2Fyahoo.com",
-                  @controller.omniauth_authorize_path(:user, :openid, :openid_url => "http://yahoo.com")
+                  @controller.omniauth_authorize_path(:user, :openid, openid_url: "http://yahoo.com")
   end
 
   test 'should not add a "?" if no param was sent' do

data/test/parameter_sanitizer_test.rb

@@ -27,7 +27,7 @@ if defined?(ActionController::StrongParameters)
     end
 
     test 'handles auth keys as a hash' do
-      swap Devise, :authentication_keys => {:email => true} do
+      swap Devise, authentication_keys: {email: true} do
         sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid" })
         assert_equal({ "email" => "jose", "password" => "invalid" }, sanitizer.sanitize(:sign_in))
       end

data/test/rails_app/app/controllers/admins_controller.rb

@@ -6,6 +6,6 @@ class AdminsController < ApplicationController
 
   def expire
     admin_session['last_request_at'] = 31.minutes.ago.utc
-    render :text => 'Admin will be expired on next request'
+    render text: 'Admin will be expired on next request'
   end
 end

data/test/rails_app/app/controllers/application_controller.rb

@@ -3,7 +3,7 @@
 
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  before_filter :current_user, :unless => :devise_controller?
-  before_filter :authenticate_user!, :if => :devise_controller?
+  before_filter :current_user, unless: :devise_controller?
+  before_filter :authenticate_user!, if: :devise_controller?
   respond_to *Mime::SET.map(&:to_sym)
 end

data/test/rails_app/app/controllers/home_controller.rb

@@ -20,6 +20,6 @@ class HomeController < ApplicationController
   end
 
   def unauthenticated
-    render :text => "unauthenticated", :status => :unauthorized
+    render text: "unauthenticated", status: :unauthorized
   end
 end

data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb

@@ -2,13 +2,13 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def facebook
     data = env["omniauth.auth"]
     session["devise.facebook_data"] = data["extra"]["user_hash"]
-    render :json => data
+    render json: data
   end
 
   def sign_in_facebook
     user = User.find_by_email('user@test.com')
     user.remember_me = true
     sign_in user
-    render :text => ""
+    render text: ""
   end
 end

data/test/rails_app/app/controllers/users_controller.rb

@@ -1,6 +1,6 @@
 class UsersController < ApplicationController
-  prepend_before_filter :current_user, :only => :exhibit
-  before_filter :authenticate_user!, :except => [:accept, :exhibit]
+  prepend_before_filter :current_user, only: :exhibit
+  before_filter :authenticate_user!, except: [:accept, :exhibit]
   respond_to :html, :xml
 
   def index
@@ -13,7 +13,7 @@ class UsersController < ApplicationController
   end
 
   def update_form
-    render :text => 'Update'
+    render text: 'Update'
   end
 
   def accept
@@ -21,11 +21,11 @@ class UsersController < ApplicationController
   end
 
   def exhibit
-    render :text => current_user ? "User is authenticated" : "User is not authenticated"
+    render text: current_user ? "User is authenticated" : "User is not authenticated"
   end
 
   def expire
     user_session['last_request_at'] = 31.minutes.ago.utc
-    render :text => 'User will be expired on next request'
+    render text: 'User will be expired on next request'
   end
 end

data/test/rails_app/app/mailers/users/mailer.rb

@@ -1,12 +1,12 @@
 class Users::Mailer < Devise::Mailer
-  default :from     => 'custom@example.com'
+  default from: 'custom@example.com'
 end
 
 class Users::ReplyToMailer < Devise::Mailer
-  default :from     => 'custom@example.com'
-  default :reply_to => 'custom_reply_to@example.com'
+  default from: 'custom@example.com'
+  default reply_to: 'custom_reply_to@example.com'
 end
 
 class Users::FromProcMailer < Devise::Mailer
-  default :from     => proc { 'custom@example.com' }
+  default from: proc { 'custom@example.com' }
 end

data/test/rails_app/app/mongoid/admin.rb

@@ -6,24 +6,24 @@ class Admin
   include SharedAdmin
 
   ## Database authenticatable
-  field :email,              :type => String
-  field :encrypted_password, :type => String
+  field :email,              type: String
+  field :encrypted_password, type: String
 
   ## Recoverable
-  field :reset_password_token,   :type => String
-  field :reset_password_sent_at, :type => Time
+  field :reset_password_token,   type: String
+  field :reset_password_sent_at, type: Time
 
   ## Rememberable
-  field :remember_created_at, :type => Time
+  field :remember_created_at, type: Time
 
   ## Confirmable
-  field :confirmation_token,   :type => String
-  field :confirmed_at,         :type => Time
-  field :confirmation_sent_at, :type => Time
-  field :unconfirmed_email,    :type => String # Only if using reconfirmable
+  field :confirmation_token,   type: String
+  field :confirmed_at,         type: Time
+  field :confirmation_sent_at, type: Time
+  field :unconfirmed_email,    type: String # Only if using reconfirmable
 
   ## Lockable
-  field :locked_at, :type => Time
+  field :locked_at, type: Time
 
-  field :active, :type => Boolean, :default => false
+  field :active, type: Boolean, default: false
 end

data/test/rails_app/app/mongoid/shim.rb

@@ -3,7 +3,7 @@ module Shim
 
   included do
     include ::Mongoid::Timestamps
-    field :created_at, :type => DateTime
+    field :created_at, type: DateTime
   end
 
   module ClassMethods
@@ -12,7 +12,7 @@ module Shim
     end
 
     def find_by_email(email)
-      find_by(:email => email)
+      find_by(email: email)
     end
   end
 

data/test/rails_app/app/mongoid/user.rb

@@ -5,35 +5,35 @@ class User
   include Shim
   include SharedUser
 
-  field :username, :type => String
-  field :facebook_token, :type => String
+  field :username, type: String
+  field :facebook_token, type: String
 
   ## Database authenticatable
-  field :email,              :type => String, :default => ""
-  field :encrypted_password, :type => String, :default => ""
+  field :email,              type: String, default: ""
+  field :encrypted_password, type: String, default: ""
 
   ## Recoverable
-  field :reset_password_token,   :type => String
-  field :reset_password_sent_at, :type => Time
+  field :reset_password_token,   type: String
+  field :reset_password_sent_at, type: Time
 
   ## Rememberable
-  field :remember_created_at, :type => Time
+  field :remember_created_at, type: Time
 
   ## Trackable
-  field :sign_in_count,      :type => Integer, :default => 0
-  field :current_sign_in_at, :type => Time
-  field :last_sign_in_at,    :type => Time
-  field :current_sign_in_ip, :type => String
-  field :last_sign_in_ip,    :type => String
+  field :sign_in_count,      type: Integer, default: 0
+  field :current_sign_in_at, type: Time
+  field :last_sign_in_at,    type: Time
+  field :current_sign_in_ip, type: String
+  field :last_sign_in_ip,    type: String
 
   ## Confirmable
-  field :confirmation_token,   :type => String
-  field :confirmed_at,         :type => Time
-  field :confirmation_sent_at, :type => Time
-  # field :unconfirmed_email,    :type => String # Only if using reconfirmable
+  field :confirmation_token,   type: String
+  field :confirmed_at,         type: Time
+  field :confirmation_sent_at, type: Time
+  # field :unconfirmed_email,    type: String # Only if using reconfirmable
 
   ## Lockable
-  field :failed_attempts, :type => Integer, :default => 0 # Only if lock strategy is :failed_attempts
-  field :unlock_token,    :type => String # Only if unlock strategy is :email or :both
-  field :locked_at,       :type => Time
+  field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
+  field :unlock_token,    type: String # Only if unlock strategy is :email or :both
+  field :locked_at,       type: Time
 end