database_cleaner 1.5.1 → 1.6.0

data/spec/database_cleaner/base_spec.rb

@@ -9,6 +9,12 @@ require 'database_cleaner/neo4j/transaction'
 module DatabaseCleaner
   describe Base do
 
+    let(:mock_strategy) {
+      double("strategy").tap{|strategy|
+        strategy.stub(:to_ary => [strategy])
+      }
+    }
+
     describe "autodetect" do
 
        #Cache all ORMs, we'll need them later but not now.
@@ -201,18 +207,38 @@ module DatabaseCleaner
 
     describe "comparison" do
       it "should be equal if orm, connection and strategy are the same" do
-        strategy = mock("strategy")
-        strategy.stub!(:to_ary => [strategy])
-
         one = DatabaseCleaner::Base.new(:active_record,:connection => :default)
-        one.strategy = strategy
+        one.strategy = mock_strategy
 
         two = DatabaseCleaner::Base.new(:active_record,:connection => :default)
-        two.strategy = strategy
+        two.strategy = mock_strategy
 
         one.should eq two
         two.should eq one
       end
+
+      it "should not be equal if orm are not the same" do
+        one = DatabaseCleaner::Base.new(:mongo_id, :connection => :default)
+        one.strategy = mock_strategy
+
+        two = DatabaseCleaner::Base.new(:active_record, :connection => :default)
+        two.strategy = mock_strategy
+
+        one.should_not eq two
+        two.should_not eq one
+      end
+
+      it "should not be equal if connection are not the same" do
+
+        one = DatabaseCleaner::Base.new(:active_record, :connection => :default)
+        one.strategy = :truncation
+
+        two = DatabaseCleaner::Base.new(:active_record, :connection => :other)
+        two.strategy = :truncation
+
+        one.should_not eq two
+        two.should_not eq one
+      end
     end
 
     describe "initialization" do
@@ -269,11 +295,7 @@ module DatabaseCleaner
     end
 
     describe "strategy_db=" do
-      let(:strategy) {
-        mock("strategy").tap{|strategy|
-          strategy.stub!(:to_ary => [strategy])
-        }
-      }
+      let(:strategy) { mock_strategy }
 
       before(:each) do
         subject.strategy = strategy
@@ -373,12 +395,6 @@ module DatabaseCleaner
     end
 
     describe "strategy=" do
-      let(:mock_strategy) {
-        mock("strategy").tap{|strategy|
-        strategy.stub!(:to_ary => [strategy])
-      }
-      }
-
       it "should proxy symbolised strategies to create_strategy" do
         subject.should_receive(:create_strategy).with(:symbol)
         subject.strategy = :symbol
@@ -417,11 +433,8 @@ module DatabaseCleaner
       end
 
       it "returns the set strategy" do
-        strategum = mock("strategy").tap{|strategy|
-          strategy.stub!(:to_ary => [strategy])
-        }
-        subject.strategy = strategum
-        subject.strategy.should eq strategum
+        subject.strategy = mock_strategy
+        subject.strategy.should eq mock_strategy
       end
     end
 

data/spec/database_cleaner/mongo_mapper/truncation_spec.rb

@@ -27,8 +27,8 @@ module DatabaseCleaner
           expected_counts.each do |model_class, expected_count|
             model_class.count.should equal(expected_count), "#{model_class} expected to have a count of #{expected_count} but was #{model_class.count}"
           end
-        rescue Spec::Expectations::ExpectationNotMetError => e
-          raise !sanity_check ? e : Spec::ExpectationNotMetError::ExpectationNotMetError.new("SANITY CHECK FAILURE! This should never happen here: #{e.message}")
+        rescue RSpec::Expectations::ExpectationNotMetError => e
+          raise !sanity_check ? e : RSpec::ExpectationNotMetError::ExpectationNotMetError.new("SANITY CHECK FAILURE! This should never happen here: #{e.message}")
         end
       end
 

data/spec/database_cleaner/null_strategy_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+module DatabaseCleaner
+  describe NullStrategy do
+      it 'responds to .start' do
+        expect { NullStrategy.start }.not_to raise_error(NoMethodError)
+      end
+
+      it 'responds to .clean' do
+        expect { NullStrategy.clean }.not_to raise_error(NoMethodError)
+      end
+
+      describe '.cleaning' do
+        it 'fails without a block' do
+          expect { NullStrategy.cleaning }.to raise_error(LocalJumpError)
+        end
+
+        it 'no-ops with a block' do
+          effect = double
+          expect(effect).to receive(:occur).once
+
+          NullStrategy.cleaning do
+            effect.occur
+          end
+        end
+      end
+  end
+end

data/spec/database_cleaner/redis/base_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'redis'
 require 'database_cleaner/redis/base'
 require 'database_cleaner/shared_strategy'
 
@@ -18,10 +19,20 @@ module DatabaseCleaner
       it { should respond_to(:db) }
       it { should respond_to(:db=) }
 
-      it "should store my describe db" do
-        url = 'redis://localhost:6379/2'
-        subject.db = 'redis://localhost:6379/2'
-        subject.db.should eq url
+      context "when passing url" do
+        it "should store my describe db" do
+          url = 'redis://localhost:6379/2'
+          subject.db = 'redis://localhost:6379/2'
+          subject.db.should eq url
+        end
+      end
+
+      context "when passing connection" do
+        it "should store my describe db" do
+          connection = ::Redis.new :url => 'redis://localhost:6379/2'
+          subject.db = connection
+          subject.db.should eq connection
+        end
       end
 
       it "should default to :default" do

data/spec/database_cleaner/redis/truncation_spec.rb

@@ -9,7 +9,7 @@ module DatabaseCleaner
     describe Truncation do
       before(:all) do
         config = YAML::load(File.open("#{File.dirname(__FILE__)}/../../../examples/config/redis.yml"))
-      @redis = ::Redis.connect :url => config['test']['url']
+      @redis = ::Redis.new :url => config['test']['url']
       end
 
       before(:each) do

data/spec/support/active_record/postgresql_setup.rb

@@ -14,6 +14,7 @@ module PostgreSQLHelper
     @encoding = default_config['encoding'] || ENV['CHARSET'] || 'utf8'
     begin
       establish_connection(default_config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+      ActiveRecord::Base.connection.drop_database(default_config['database']) rescue nil
       ActiveRecord::Base.connection.create_database(default_config['database'], default_config.merge('encoding' => @encoding))
     rescue Exception => e
       $stderr.puts e, *(e.backtrace)
@@ -32,7 +33,6 @@ module PostgreSQLHelper
   end
 
   def active_record_pg_migrate
-    `dropdb #{default_config['database']}`
     create_db
     establish_connection
     ActiveRecord::Migrator.migrate 'spec/support/active_record/migrations'