Compatibility with Ruby 1.9.1 and 1.9.2.
This commit is contained in:
parent
5c19605d6f
commit
ca4e09390e
2
Rakefile
2
Rakefile
|
@ -37,7 +37,7 @@ begin
|
||||||
require 'jeweler'
|
require 'jeweler'
|
||||||
Jeweler::Tasks.new do |s|
|
Jeweler::Tasks.new do |s|
|
||||||
s.name = "devise"
|
s.name = "devise"
|
||||||
s.version = Devise::VERSION
|
s.version = Devise::VERSION.dup
|
||||||
s.summary = "Flexible authentication solution for Rails with Warden"
|
s.summary = "Flexible authentication solution for Rails with Warden"
|
||||||
s.email = "contact@plataformatec.com.br"
|
s.email = "contact@plataformatec.com.br"
|
||||||
s.homepage = "http://github.com/plataformatec/devise"
|
s.homepage = "http://github.com/plataformatec/devise"
|
||||||
|
|
2
TODO
2
TODO
|
@ -1,2 +1,2 @@
|
||||||
* Make test run with DataMapper
|
|
||||||
* Extract Activatable tests from Confirmable
|
* Extract Activatable tests from Confirmable
|
||||||
|
* Move integration tests to Capybara
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
require 'ostruct'
|
require 'ostruct'
|
||||||
|
|
||||||
class MockController < ApplicationController
|
class MockController < ApplicationController
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class MyController < ApplicationController
|
class MyController < ApplicationController
|
||||||
include Devise::Controllers::InternalHelpers
|
include Devise::Controllers::InternalHelpers
|
||||||
|
@ -7,6 +7,11 @@ end
|
||||||
class HelpersTest < ActionController::TestCase
|
class HelpersTest < ActionController::TestCase
|
||||||
tests MyController
|
tests MyController
|
||||||
|
|
||||||
|
def setup
|
||||||
|
@mock_warden = OpenStruct.new
|
||||||
|
@controller.request.env['warden'] = @mock_warden
|
||||||
|
end
|
||||||
|
|
||||||
test 'get resource name from request path' do
|
test 'get resource name from request path' do
|
||||||
@request.path = '/users/session'
|
@request.path = '/users/session'
|
||||||
assert_equal :user, @controller.resource_name
|
assert_equal :user, @controller.resource_name
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class RoutesTest < ActionController::TestCase
|
class RoutesTest < ActionController::TestCase
|
||||||
tests ApplicationController
|
tests ApplicationController
|
||||||
|
|
||||||
def test_path_and_url(name, prepend_path=nil)
|
def assert_path_and_url(name, prepend_path=nil)
|
||||||
@request.path = '/users/session'
|
@request.path = '/users/session'
|
||||||
prepend_path = "#{prepend_path}_" if prepend_path
|
prepend_path = "#{prepend_path}_" if prepend_path
|
||||||
|
|
||||||
|
@ -29,19 +29,19 @@ class RoutesTest < ActionController::TestCase
|
||||||
|
|
||||||
|
|
||||||
test 'should alias session to mapped user session' do
|
test 'should alias session to mapped user session' do
|
||||||
test_path_and_url :session
|
assert_path_and_url :session
|
||||||
test_path_and_url :session, :new
|
assert_path_and_url :session, :new
|
||||||
test_path_and_url :session, :destroy
|
assert_path_and_url :session, :destroy
|
||||||
end
|
end
|
||||||
|
|
||||||
test 'should alias password to mapped user password' do
|
test 'should alias password to mapped user password' do
|
||||||
test_path_and_url :password
|
assert_path_and_url :password
|
||||||
test_path_and_url :password, :new
|
assert_path_and_url :password, :new
|
||||||
test_path_and_url :password, :edit
|
assert_path_and_url :password, :edit
|
||||||
end
|
end
|
||||||
|
|
||||||
test 'should alias confirmation to mapped user confirmation' do
|
test 'should alias confirmation to mapped user confirmation' do
|
||||||
test_path_and_url :confirmation
|
assert_path_and_url :confirmation
|
||||||
test_path_and_url :confirmation, :new
|
assert_path_and_url :confirmation, :new
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
module Devise
|
module Devise
|
||||||
def self.clean_warden_config!
|
def self.clean_warden_config!
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
require 'test_helper'
|
||||||
|
|
||||||
class Encryptors < ActiveSupport::TestCase
|
class Encryptors < ActiveSupport::TestCase
|
||||||
test 'should match a password created by authlogic' do
|
test 'should match a password created by authlogic' do
|
||||||
authlogic = "b623c3bc9c775b0eb8edb218a382453396fec4146422853e66ecc4b6bc32d7162ee42074dcb5f180a770dc38b5df15812f09bbf497a4a1b95fe5e7d2b8eb7eb4"
|
authlogic = "b623c3bc9c775b0eb8edb218a382453396fec4146422853e66ecc4b6bc32d7162ee42074dcb5f180a770dc38b5df15812f09bbf497a4a1b95fe5e7d2b8eb7eb4"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
require 'ostruct'
|
require 'ostruct'
|
||||||
|
|
||||||
class FailureTest < ActiveSupport::TestCase
|
class FailureTest < ActiveSupport::TestCase
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class AuthenticationSanityTest < ActionController::IntegrationTest
|
class AuthenticationSanityTest < ActionController::IntegrationTest
|
||||||
test 'home should be accessible without sign in' do
|
test 'home should be accessible without sign in' do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class ConfirmationTest < ActionController::IntegrationTest
|
class ConfirmationTest < ActionController::IntegrationTest
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class HttpAuthenticationTest < ActionController::IntegrationTest
|
class HttpAuthenticationTest < ActionController::IntegrationTest
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class LockTest < ActionController::IntegrationTest
|
class LockTest < ActionController::IntegrationTest
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class PasswordTest < ActionController::IntegrationTest
|
class PasswordTest < ActionController::IntegrationTest
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class RegistrationTest < ActionController::IntegrationTest
|
class RegistrationTest < ActionController::IntegrationTest
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class RememberMeTest < ActionController::IntegrationTest
|
class RememberMeTest < ActionController::IntegrationTest
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class SessionTimeoutTest < ActionController::IntegrationTest
|
class SessionTimeoutTest < ActionController::IntegrationTest
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class TokenAuthenticationTest < ActionController::IntegrationTest
|
class TokenAuthenticationTest < ActionController::IntegrationTest
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class TrackableHooksTest < ActionController::IntegrationTest
|
class TrackableHooksTest < ActionController::IntegrationTest
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class ConfirmationInstructionsTest < ActionMailer::TestCase
|
class ConfirmationInstructionsTest < ActionMailer::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class ResetPasswordInstructionsTest < ActionMailer::TestCase
|
class ResetPasswordInstructionsTest < ActionMailer::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class UnlockInstructionsTest < ActionMailer::TestCase
|
class UnlockInstructionsTest < ActionMailer::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class MappingTest < ActiveSupport::TestCase
|
class MappingTest < ActiveSupport::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
require 'digest/sha1'
|
require 'digest/sha1'
|
||||||
|
|
||||||
class AuthenticatableTest < ActiveSupport::TestCase
|
class AuthenticatableTest < ActiveSupport::TestCase
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class ConfirmableTest < ActiveSupport::TestCase
|
class ConfirmableTest < ActiveSupport::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class HttpAuthenticatableTest < ActiveSupport::TestCase
|
class HttpAuthenticatableTest < ActiveSupport::TestCase
|
||||||
test 'should authenticate a valid user with email and password and return it' do
|
test 'should authenticate a valid user with email and password and return it' do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class LockableTest < ActiveSupport::TestCase
|
class LockableTest < ActiveSupport::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class RecoverableTest < ActiveSupport::TestCase
|
class RecoverableTest < ActiveSupport::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class RememberableTest < ActiveSupport::TestCase
|
class RememberableTest < ActiveSupport::TestCase
|
||||||
test 'should respond to remember_me attribute' do
|
test 'should respond to remember_me attribute' do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class TimeoutableTest < ActiveSupport::TestCase
|
class TimeoutableTest < ActiveSupport::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class TokenAuthenticatableTest < ActiveSupport::TestCase
|
class TokenAuthenticatableTest < ActiveSupport::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class TrackableTest < ActiveSupport::TestCase
|
class TrackableTest < ActiveSupport::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class ValidatableTest < ActiveSupport::TestCase
|
class ValidatableTest < ActiveSupport::TestCase
|
||||||
extend Devise::TestSilencer if [:mongo_mapper, :data_mapper].include?(DEVISE_ORM)
|
extend Devise::TestSilencer if [:mongo_mapper, :data_mapper].include?(DEVISE_ORM)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class Configurable < User
|
class Configurable < User
|
||||||
devise :authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
|
devise :authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class MapRoutingTest < ActionController::TestCase
|
class MapRoutingTest < ActionController::TestCase
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require 'test/test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class TestHelpersTest < ActionController::TestCase
|
class TestHelpersTest < ActionController::TestCase
|
||||||
tests UsersController
|
tests UsersController
|
||||||
|
|
Loading…
Reference in New Issue