Permalink
Browse files

Merge pull request #1794 from aderyabin/master

Clean up global namespaces
  • Loading branch information...
2 parents 64c99bc + 9ec1003 commit 3752981cfa6882c599e6f4be590fd9ae83c3f37a @josevalim josevalim committed Apr 16, 2012
@@ -67,7 +67,7 @@ def encryptor_class
when nil
raise "You need to give an :encryptor as option in order to use :encryptable"
else
- ::Devise::Encryptors.const_get(encryptor.to_s.classify)
+ Devise::Encryptors.const_get(encryptor.to_s.classify)
end
end
@@ -70,7 +70,7 @@ def authentication_token
generate_token(:authentication_token)
end
- ::Devise::Models.config(self, :token_authentication_key, :expire_auth_token_on_timeout)
+ Devise::Models.config(self, :token_authentication_key, :expire_auth_token_on_timeout)
end
end
end
@@ -54,7 +54,7 @@ def swap_with_encryptor(klass, encryptor, options={})
test 'should respect encryptor configuration' do
swap_with_encryptor Admin, :sha512 do
admin = create_admin
- assert_equal admin.encrypted_password, encrypt_password(admin, Admin.pepper, Admin.stretches, ::Devise::Encryptors::Sha512)
+ assert_equal admin.encrypted_password, encrypt_password(admin, Admin.pepper, Admin.stretches, Devise::Encryptors::Sha512)
end
end

0 comments on commit 3752981

Please sign in to comment.