test/controllers/internal_helpers_test.rb in devise-3.2.3 vs test/controllers/internal_helpers_test.rb in devise-3.2.4
- old
+ new
@@ -53,11 +53,11 @@
test 'resources methods are not controller actions' do
assert @controller.class.action_methods.empty?
end
test 'require no authentication tests current mapping' do
- @mock_warden.expects(:authenticate?).with(:rememberable, :scope => :user).returns(true)
+ @mock_warden.expects(:authenticate?).with(:rememberable, scope: :user).returns(true)
@mock_warden.expects(:user).with(:user).returns(User.new)
@controller.expects(:redirect_to).with(root_path)
@controller.send :require_no_authentication
end
@@ -69,19 +69,19 @@
@controller.expects(:redirect_to).with(root_path)
@controller.send :require_no_authentication
end
test 'require no authentication sets a flash message' do
- @mock_warden.expects(:authenticate?).with(:rememberable, :scope => :user).returns(true)
+ @mock_warden.expects(:authenticate?).with(:rememberable, scope: :user).returns(true)
@mock_warden.expects(:user).with(:user).returns(User.new)
@controller.expects(:redirect_to).with(root_path)
@controller.send :require_no_authentication
assert flash[:alert] == I18n.t("devise.failure.already_authenticated")
end
test 'signed in resource returns signed in resource for current scope' do
- @mock_warden.expects(:authenticate).with(:scope => :user).returns(User.new)
+ @mock_warden.expects(:authenticate).with(scope: :user).returns(User.new)
assert_kind_of User, @controller.signed_in_resource
end
test 'is a devise controller' do
assert @controller.devise_controller?
@@ -98,24 +98,24 @@
@controller.send :set_flash_message, :notice, :send_instructions
assert_equal 'non-blank', flash[:notice]
end
test 'uses custom i18n options' do
- @controller.stubs(:devise_i18n_options).returns(:default => "devise custom options")
+ @controller.stubs(:devise_i18n_options).returns(default: "devise custom options")
@controller.send :set_flash_message, :notice, :invalid_i18n_messagesend_instructions
assert_equal 'devise custom options', flash[:notice]
end
test 'allows custom i18n options to override resource_name' do
I18n.expects(:t).with("custom_resource_name.confirmed", anything)
- @controller.stubs(:devise_i18n_options).returns(:resource_name => "custom_resource_name")
+ @controller.stubs(:devise_i18n_options).returns(resource_name: "custom_resource_name")
@controller.send :set_flash_message, :notice, :confirmed
end
test 'navigational_formats not returning a wild card' do
MyController.send(:public, :navigational_formats)
- swap Devise, :navigational_formats => ['*/*', :html] do
+ swap Devise, navigational_formats: ['*/*', :html] do
assert_not @controller.navigational_formats.include?("*/*")
end
MyController.send(:protected, :navigational_formats)
end