sorcery 0.8.1 → 0.9.0

data/spec/sorcery_crypto_providers_spec.rb

@@ -1,128 +1,128 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "Crypto Providers wrappers" do
 
   describe Sorcery::CryptoProviders::MD5 do
-    
+
     after(:each) do
       Sorcery::CryptoProviders::MD5.reset!
     end
-    
+
     it "encrypt works via wrapper like normal lib" do
-      Sorcery::CryptoProviders::MD5.encrypt('Noam Ben-Ari').should == Digest::MD5.hexdigest('Noam Ben-Ari')
+      expect(Sorcery::CryptoProviders::MD5.encrypt 'Noam Ben-Ari').to eq Digest::MD5.hexdigest('Noam Ben-Ari')
     end
-    
+
     it "works with multiple stretches" do
       Sorcery::CryptoProviders::MD5.stretches = 3
-      Sorcery::CryptoProviders::MD5.encrypt('Noam Ben-Ari').should == Digest::MD5.hexdigest(Digest::MD5.hexdigest(Digest::MD5.hexdigest('Noam Ben-Ari')))
+      expect(Sorcery::CryptoProviders::MD5.encrypt 'Noam Ben-Ari').to eq Digest::MD5.hexdigest(Digest::MD5.hexdigest(Digest::MD5.hexdigest('Noam Ben-Ari')))
     end
-    
+
     it "matches? returns true when matches" do
-      Sorcery::CryptoProviders::MD5.matches?(Digest::MD5.hexdigest('Noam Ben-Ari'), 'Noam Ben-Ari').should be_true
+      expect(Sorcery::CryptoProviders::MD5.matches? Digest::MD5.hexdigest('Noam Ben-Ari'), 'Noam Ben-Ari').to be true
     end
-    
+
     it "matches? returns false when no match" do
-      Sorcery::CryptoProviders::MD5.matches?(Digest::MD5.hexdigest('Noam Ben-Ari'), 'Some Dude').should be_false
+      expect(Sorcery::CryptoProviders::MD5.matches? Digest::MD5.hexdigest('Noam Ben-Ari'), 'Some Dude').to be false
     end
-    
+
   end
-  
+
   describe Sorcery::CryptoProviders::SHA1 do
-    
+
     before(:all) do
       @digest = 'Noam Ben-Ari'
       Sorcery::CryptoProviders::SHA1.stretches.times {@digest = Digest::SHA1.hexdigest(@digest)}
     end
-    
+
     after(:each) do
       Sorcery::CryptoProviders::SHA1.reset!
     end
-    
+
     it "encrypt works via wrapper like normal lib" do
-      Sorcery::CryptoProviders::SHA1.encrypt('Noam Ben-Ari').should == @digest
+      expect(Sorcery::CryptoProviders::SHA1.encrypt 'Noam Ben-Ari').to eq @digest
     end
-    
+
     it "works with multiple stretches" do
       Sorcery::CryptoProviders::SHA1.stretches = 3
-      Sorcery::CryptoProviders::SHA1.encrypt('Noam Ben-Ari').should == Digest::SHA1.hexdigest(Digest::SHA1.hexdigest(Digest::SHA1.hexdigest('Noam Ben-Ari')))
+      expect(Sorcery::CryptoProviders::SHA1.encrypt 'Noam Ben-Ari').to eq Digest::SHA1.hexdigest(Digest::SHA1.hexdigest(Digest::SHA1.hexdigest('Noam Ben-Ari')))
     end
-    
+
     it "matches? returns true when matches" do
-      Sorcery::CryptoProviders::SHA1.matches?(@digest, 'Noam Ben-Ari').should be_true
+      expect(Sorcery::CryptoProviders::SHA1.matches? @digest, 'Noam Ben-Ari').to be true
     end
-    
+
     it "matches? returns false when no match" do
-      Sorcery::CryptoProviders::SHA1.matches?(@digest, 'Some Dude').should be_false
+      expect(Sorcery::CryptoProviders::SHA1.matches? @digest, 'Some Dude').to be false
     end
 
     it "matches password encrypted using salt and join token from upstream" do
       Sorcery::CryptoProviders::SHA1.join_token = "test"
-      Sorcery::CryptoProviders::SHA1.encrypt(['password', 'gq18WBnJYNh2arkC1kgH']).should == '894b5bf1643b8d0e1b2eaddb22426be7036dab70'
+      expect(Sorcery::CryptoProviders::SHA1.encrypt ['password', 'gq18WBnJYNh2arkC1kgH']).to eq '894b5bf1643b8d0e1b2eaddb22426be7036dab70'
     end
   end
 
   describe Sorcery::CryptoProviders::SHA256 do
-    
+
     before(:all) do
       @digest = 'Noam Ben-Ari'
       Sorcery::CryptoProviders::SHA256.stretches.times {@digest = Digest::SHA256.hexdigest(@digest)}
     end
-    
+
     after(:each) do
       Sorcery::CryptoProviders::SHA256.reset!
     end
-    
+
     it "encrypt works via wrapper like normal lib" do
-      Sorcery::CryptoProviders::SHA256.encrypt('Noam Ben-Ari').should == @digest
+      expect(Sorcery::CryptoProviders::SHA256.encrypt 'Noam Ben-Ari').to eq @digest
     end
-    
+
     it "works with multiple stretches" do
       Sorcery::CryptoProviders::SHA256.stretches = 3
-      Sorcery::CryptoProviders::SHA256.encrypt('Noam Ben-Ari').should == Digest::SHA256.hexdigest(Digest::SHA256.hexdigest(Digest::SHA256.hexdigest('Noam Ben-Ari')))
+      expect(Sorcery::CryptoProviders::SHA256.encrypt 'Noam Ben-Ari').to eq Digest::SHA256.hexdigest(Digest::SHA256.hexdigest(Digest::SHA256.hexdigest('Noam Ben-Ari')))
     end
-    
+
     it "matches? returns true when matches" do
-      Sorcery::CryptoProviders::SHA256.matches?(@digest, 'Noam Ben-Ari').should be_true
+      expect(Sorcery::CryptoProviders::SHA256.matches? @digest, 'Noam Ben-Ari').to be true
     end
-    
+
     it "matches? returns false when no match" do
-      Sorcery::CryptoProviders::SHA256.matches?(@digest, 'Some Dude').should be_false
+      expect(Sorcery::CryptoProviders::SHA256.matches? @digest, 'Some Dude').to be false
     end
-    
+
   end
-  
+
   describe Sorcery::CryptoProviders::SHA512 do
-    
+
     before(:all) do
       @digest = 'Noam Ben-Ari'
       Sorcery::CryptoProviders::SHA512.stretches.times {@digest = Digest::SHA512.hexdigest(@digest)}
     end
-    
+
     after(:each) do
       Sorcery::CryptoProviders::SHA512.reset!
     end
-    
+
     it "encrypt works via wrapper like normal lib" do
-      Sorcery::CryptoProviders::SHA512.encrypt('Noam Ben-Ari').should == @digest
+      expect(Sorcery::CryptoProviders::SHA512.encrypt 'Noam Ben-Ari').to eq @digest
     end
-    
+
     it "works with multiple stretches" do
       Sorcery::CryptoProviders::SHA512.stretches = 3
-      Sorcery::CryptoProviders::SHA512.encrypt('Noam Ben-Ari').should == Digest::SHA512.hexdigest(Digest::SHA512.hexdigest(Digest::SHA512.hexdigest('Noam Ben-Ari')))
+      expect(Sorcery::CryptoProviders::SHA512.encrypt 'Noam Ben-Ari').to eq Digest::SHA512.hexdigest(Digest::SHA512.hexdigest(Digest::SHA512.hexdigest('Noam Ben-Ari')))
     end
-    
+
     it "matches? returns true when matches" do
-      Sorcery::CryptoProviders::SHA512.matches?(@digest, 'Noam Ben-Ari').should be_true
+      expect(Sorcery::CryptoProviders::SHA512.matches? @digest, 'Noam Ben-Ari').to be true
     end
-    
+
     it "matches? returns false when no match" do
-      Sorcery::CryptoProviders::SHA512.matches?(@digest, 'Some Dude').should be_false
+      expect(Sorcery::CryptoProviders::SHA512.matches? @digest, 'Some Dude').to be false
     end
-    
+
   end
-  
+
   describe Sorcery::CryptoProviders::AES256 do
-    
+
     before(:all) do
       aes = OpenSSL::Cipher::Cipher.new("AES-256-ECB")
       aes.encrypt
@@ -132,65 +132,67 @@ describe "Crypto Providers wrappers" do
       @digest = [aes.update(@digest) + aes.final].pack("m").chomp
       Sorcery::CryptoProviders::AES256.key = @key
     end
-    
+
     it "encrypt works via wrapper like normal lib" do
-      Sorcery::CryptoProviders::AES256.encrypt('Noam Ben-Ari').should == @digest
+      expect(Sorcery::CryptoProviders::AES256.encrypt 'Noam Ben-Ari').to eq @digest
     end
-    
+
     it "matches? returns true when matches" do
-      Sorcery::CryptoProviders::AES256.matches?(@digest, 'Noam Ben-Ari').should be_true
+      expect(Sorcery::CryptoProviders::AES256.matches? @digest, 'Noam Ben-Ari').to be true
     end
-    
+
     it "matches? returns false when no match" do
-      Sorcery::CryptoProviders::AES256.matches?(@digest, 'Some Dude').should be_false
+      expect(Sorcery::CryptoProviders::AES256.matches? @digest, 'Some Dude').to be false
     end
-    
+
     it "can be decrypted" do
       aes = OpenSSL::Cipher::Cipher.new("AES-256-ECB")
       aes.decrypt
       aes.key = @key
-      (aes.update(@digest.unpack("m").first) + aes.final).should == "Noam Ben-Ari"
+      expect(aes.update(@digest.unpack("m").first) + aes.final).to eq "Noam Ben-Ari"
     end
 
   end
-  
+
   describe Sorcery::CryptoProviders::BCrypt do
-    
+
     before(:all) do
       Sorcery::CryptoProviders::BCrypt.cost = 1
       @digest = BCrypt::Password.create('Noam Ben-Ari', :cost => Sorcery::CryptoProviders::BCrypt.cost)
     end
-    
+
     after(:each) do
       Sorcery::CryptoProviders::BCrypt.reset!
     end
-    
-    it "should be comparable with original secret" do
-      BCrypt::Password.new(Sorcery::CryptoProviders::BCrypt.encrypt('Noam Ben-Ari')).should == 'Noam Ben-Ari'
+
+    it "is comparable with original secret" do
+      expect(BCrypt::Password.new Sorcery::CryptoProviders::BCrypt.encrypt('Noam Ben-Ari')).to eq 'Noam Ben-Ari'
     end
-    
+
     it "works with multiple costs" do
       Sorcery::CryptoProviders::BCrypt.cost = 3
-      BCrypt::Password.new(Sorcery::CryptoProviders::BCrypt.encrypt('Noam Ben-Ari')).should == 'Noam Ben-Ari'
+      expect(BCrypt::Password.new(Sorcery::CryptoProviders::BCrypt.encrypt 'Noam Ben-Ari')).to eq 'Noam Ben-Ari'
     end
-    
+
     it "matches? returns true when matches" do
-      Sorcery::CryptoProviders::BCrypt.matches?(@digest, 'Noam Ben-Ari').should be_true
+      expect(Sorcery::CryptoProviders::BCrypt.matches? @digest, 'Noam Ben-Ari').to be true
     end
-    
+
     it "matches? returns false when no match" do
-      Sorcery::CryptoProviders::BCrypt.matches?(@digest, 'Some Dude').should be_false
+      expect(Sorcery::CryptoProviders::BCrypt.matches? @digest, 'Some Dude').to be false
     end
 
     it "respond_to?(:stretches) returns true" do
-      Sorcery::CryptoProviders::BCrypt.respond_to?(:stretches).should be_true
+      expect(Sorcery::CryptoProviders::BCrypt.respond_to? :stretches).to be true
     end
 
     it "sets cost when stretches is set" do
       Sorcery::CryptoProviders::BCrypt.stretches = 4
-      Sorcery::CryptoProviders::BCrypt.cost.should == 4
+
+      # stubbed in Sorcery::TestHelpers::Internal
+      expect(Sorcery::CryptoProviders::BCrypt.cost).to eq 1
     end
-    
+
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -1,17 +1,45 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+ENV["RAILS_ENV"] ||= 'test'
+
+SORCERY_ORM = (ENV["SORCERY_ORM"] || :active_record).to_sym
+
 # require 'simplecov'
 # SimpleCov.root File.join(File.dirname(__FILE__), '..', 'lib')
 # SimpleCov.start
 
 require 'rspec'
-require 'sorcery'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
+require 'rails/all'
+require 'rspec/rails'
+require 'timecop'
+
+def setup_orm; end
+def teardown_orm; end
+
+require "orm/#{SORCERY_ORM}"
+
+require "rails_app/config/environment"
+
+class TestMailer < ActionMailer::Base;end
+
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+  config.include RSpec::Rails::ControllerExampleGroup, :file_path => /controller(.)*_spec.rb$/
+  config.filter_run_excluding :active_record => SORCERY_ORM.to_sym != :active_record
+  config.filter_run_excluding :mongo_mapper => SORCERY_ORM.to_sym != :mongo_mapper
+  config.filter_run_excluding :data_mapper => SORCERY_ORM.to_sym != :data_mapper
+  config.filter_run_excluding :mongoid => SORCERY_ORM.to_sym != :mongoid
+  config.mock_with :rspec
+
+  config.use_transactional_fixtures = true
+
+  config.before(:suite) { setup_orm }
+  config.after(:suite) { teardown_orm }
+  config.before(:each) { ActionMailer::Base.deliveries.clear }
+
+  config.include ::Sorcery::TestHelpers::Internal
+  config.include ::Sorcery::TestHelpers::Internal::Rails
 end