database_cleaner 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35bb176b3479b670a9d789e0b6115590fe84aeee
-  data.tar.gz: 30b5dbd03d0b8ac5249712fbe2b1e9ec44809f99
+  metadata.gz: ee5d65788bad454f27cf157e4015b137c7f1df81
+  data.tar.gz: 824981f5faf89ee047760c5059f5ffc0315fd953
 SHA512:
-  metadata.gz: 9e70863bb6c44d9fea1364be4d5308a7221c1b2babd6bc4d4fbbc5515eaee929d54b5bf655d8816ad7f1085f34136dcf7d471437c6c2ed535985e3fe421c3f63
-  data.tar.gz: b93b8e8de63d8d5c7602b6e7ab219ebb4bfa9cfc9013e30f723879538aa1d0ef1943ca1652892836de8cd633a689af083ab639b24dc8370036e360ced9608cfb
+  metadata.gz: 89fe47e944fa6151f788c80607472c72316db36b516ade7780c11e9830bb7d55e977601453d865775fdedaddcae6109d8c163288e6aeebd974efcdfc61c95dff
+  data.tar.gz: 93c1ebe47ddbe32f66524711cba00adb70e13c9a501d6cd8caaf785f17771a9e7625e65d73afecb2847dbeb8b367003c0aa99ab4362f2c161c89557251b38257

data/Gemfile.lock

@@ -1,3 +1,8 @@
+PATH
+  remote: .
+  specs:
+    database_cleaner (1.5.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -25,7 +30,6 @@ GEM
       mysql2
     activesupport (3.0.0)
     addressable (2.3.6)
-    archive-tar-minitar (0.5.2)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     bcrypt (3.1.7)
@@ -40,7 +44,6 @@ GEM
       bson (~> 1.11.1)
     builder (2.1.2)
     coderay (1.1.0)
-    columnize (0.8.9)
     couch_potato (1.3.0)
       activemodel
       couchrest (~> 1.2.0)
@@ -101,8 +104,14 @@ GEM
       uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
+    do_jdbc (0.10.14-java)
+      data_objects (= 0.10.14)
     do_sqlite3 (0.10.14)
       data_objects (= 0.10.14)
+    do_sqlite3 (0.10.14-java)
+      data_objects (= 0.10.14)
+      do_jdbc (= 0.10.14)
+      jdbc-sqlite3 (>= 3.5.8)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     faraday (0.9.0)
@@ -131,13 +140,10 @@ GEM
       multi_xml (>= 0.5.2)
     httpclient (2.5.3.3)
     i18n (0.4.2)
+    jdbc-sqlite3 (3.8.10.1)
     json (1.8.1)
     json (1.8.1-java)
     json_pure (1.8.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -163,7 +169,7 @@ GEM
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql (2.9.1)
-    mysql2 (0.3.16)
+    mysql2 (0.3.18)
     neo4j-community (2.1.5)
     neo4j-core (3.0.8)
       activesupport
@@ -182,7 +188,7 @@ GEM
     ohm (0.1.5)
       nest (~> 1.0)
     os (0.9.6)
-    pg (0.17.1)
+    pg (0.18.2)
     plucky (0.5.2)
       mongo (~> 1.5)
     pry (0.10.1)
@@ -210,7 +216,6 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
-    rbx-require-relative (0.0.9)
     rdoc (4.1.2)
       json (~> 1.4)
     redis (3.1.0)
@@ -230,28 +235,11 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.11.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     sequel (3.21.0)
     slop (3.6.0)
     spoon (0.0.4)
       ffi
-    sqlite3 (1.3.9)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
+    sqlite3 (1.3.10)
     stringex (1.5.1)
     thor (0.14.6)
     tzinfo (0.3.41)
@@ -269,6 +257,7 @@ DEPENDENCIES
   bundler
   couch_potato
   cucumber
+  database_cleaner!
   datamapper
   dm-migrations
   dm-sqlite-adapter
@@ -285,10 +274,10 @@ DEPENDENCIES
   ohm (~> 0.1.3)
   pg
   rake
-  rspec-rails
-  ruby-debug
-  ruby-debug19
+  rspec-rails (~> 2.11.0)
   sequel (~> 3.21.0)
   sqlite3
-  sqlite3-ruby
   tzinfo
+
+BUNDLED WITH
+   1.10.5

data/README.markdown

@@ -7,7 +7,7 @@ Each strategy is a small amount of code but is code that is usually needed in an
 
 ActiveRecord, DataMapper, Sequel, MongoMapper, Mongoid, CouchPotato, Ohm and Redis are supported.
 
-[![Build Status](https://travis-ci.org/DatabaseCleaner/database_cleaner.svg?branch=master)](https://travis-ci.org/DatabaseCleaner/database_cleaner)
+[![Build Status](https://travis-ci.org/DatabaseCleaner/database_cleaner.svg?branch=master)](https://travis-ci.org/DatabaseCleaner/database_cleaner) [![Code Climate](https://codeclimate.com/github/DatabaseCleaner/database_cleaner/badges/gpa.svg)](https://codeclimate.com/github/DatabaseCleaner/database_cleaner)
 
 Here is an overview of the strategies supported for each library:
 
@@ -197,7 +197,7 @@ The following options are available for ActiveRecord's `:truncation` strategy _o
 
 The following option is available for ActiveRecord's `:truncation` and `:deletion` strategy for any DB.
 
-* `:cache_tables` - When set to `true` the list of tables to truncate or delete from will only be read from the DB once, otherwise it will be read before each cleanup run. Set this to `false` if you create and drop tables in your tests. Defaults to `true`.
+* `:cache_tables` - When set to `true` the list of tables to truncate or delete from will only be read from the DB once, otherwise it will be read before each cleanup run. Set this to `false` if (1) you create and drop tables in your tests, or (2) you change Postgres schemas (`ActiveRecord::Base.connection.schema_search_path`) in your tests (for example, in a multitenancy setup with each tenant in a different Postgres schema). Defaults to `true`.
 
 
 ### RSpec Example
@@ -219,12 +219,38 @@ RSpec.configure do |config|
 end
 ```
 
+### RSpec with Capybara Example
+
+If you're using Capybara with RSpec and using an external browser (not using RackTest) you'll almost certainly need to use truncation rather than transactions for tests tagged `:js`.
+
+```ruby
+RSpec.configure do |config|
+
+  config.use_transactional_fixtures = false
+
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do |example|
+    DatabaseCleaner.strategy = example.metadata[:js] ? :truncation : :transaction
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+
+end
+```
+
+
 ### Minitest Example
 
 ```ruby
 DatabaseCleaner.strategy = :transaction
 
-class MiniTest::Spec
+class Minitest::Spec
   before :each do
     DatabaseCleaner.start
   end
@@ -279,10 +305,10 @@ DatabaseCleaner[:active_record].strategy = :transaction
 DatabaseCleaner[:mongo_mapper].strategy = :truncation
 
 #How to specify particular connections
-DatabaseCleaner[:active_record,{:connection => :two}]
+DatabaseCleaner[:active_record, { :connection => :two }]
 
 # You may also pass in the model directly:
-DatabaseCleaner[:active_record,{:model => ModelWithDifferentConnection}]
+DatabaseCleaner[:active_record, { :model => ModelWithDifferentConnection }]
 ```
 
 Usage beyond that remains the same with `DatabaseCleaner.start` calling any setup on the different configured connections, and `DatabaseCleaner.clean` executing afterwards.

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
-:minor: 4
-:patch: 1
+:minor: 5
+:patch: 0

data/examples/Gemfile

@@ -1,56 +1 @@
-source "https://rubygems.org"
-# TODO: move these to the gemspec...
-
-group :development, :test do
-  gem "rake"
-  gem "ruby-debug", :platform => :ruby_18
-  gem "ruby-debug19", :platform => :ruby_19
-  gem "bundler"
-
-  gem "json_pure"
-
-  gem "activerecord-mysql2-adapter"
-  #ORM's
-  gem "activerecord"
-  gem "datamapper"
-  gem "dm-migrations"
-  gem "dm-sqlite-adapter"
-  gem "mongoid"
-  gem "tzinfo"
-  gem "mongo_ext"
-  gem "bson_ext"
-  gem "mongoid-tree"
-
-  gem "mongo_mapper"
-  gem "moped"
-  gem "neo4j-core"
-  gem "couch_potato"
-
-  gem "sequel", "~> 3.21.0"
-  #gem "ibm_db"  # I don't want to add this dependency, even as a dev one since it requires DB2 to be installed
-  gem 'mysql', '~> 2.9.1'
-  gem 'mysql2'
-  gem 'pg'
-  gem 'ohm', '~> 0.1.3'
-
-  gem 'guard-rspec'
-end
-
-group :test do
-  gem "rspec-rails"
-  gem "sqlite3"
-end
-
-group :cucumber do
-  gem "cucumber"
-end
-
-platforms :mri_18 do
-  gem 'sqlite3-ruby', :group => :cucumber
-  #gem 'mysql', :group => :development
-end
-
-platforms :mri_19 do
-  gem 'sqlite3', :group => :cucumber
-  #gem 'mysql2', :group => :development
-end
+gemspec

data/examples/Gemfile.lock

@@ -1,3 +1,8 @@
+PATH
+  remote: .
+  specs:
+    database_cleaner (1.5.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -25,7 +30,6 @@ GEM
       mysql2
     activesupport (3.0.0)
     addressable (2.3.6)
-    archive-tar-minitar (0.5.2)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     bcrypt (3.1.7)
@@ -40,7 +44,6 @@ GEM
       bson (~> 1.11.1)
     builder (2.1.2)
     coderay (1.1.0)
-    columnize (0.8.9)
     couch_potato (1.3.0)
       activemodel
       couchrest (~> 1.2.0)
@@ -101,8 +104,14 @@ GEM
       uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
+    do_jdbc (0.10.14-java)
+      data_objects (= 0.10.14)
     do_sqlite3 (0.10.14)
       data_objects (= 0.10.14)
+    do_sqlite3 (0.10.14-java)
+      data_objects (= 0.10.14)
+      do_jdbc (= 0.10.14)
+      jdbc-sqlite3 (>= 3.5.8)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     faraday (0.9.0)
@@ -131,13 +140,10 @@ GEM
       multi_xml (>= 0.5.2)
     httpclient (2.5.3.3)
     i18n (0.4.2)
+    jdbc-sqlite3 (3.8.10.1)
     json (1.8.1)
     json (1.8.1-java)
     json_pure (1.8.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -163,7 +169,7 @@ GEM
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql (2.9.1)
-    mysql2 (0.3.16)
+    mysql2 (0.3.18)
     neo4j-community (2.1.5)
     neo4j-core (3.0.8)
       activesupport
@@ -182,7 +188,7 @@ GEM
     ohm (0.1.5)
       nest (~> 1.0)
     os (0.9.6)
-    pg (0.17.1)
+    pg (0.18.2)
     plucky (0.5.2)
       mongo (~> 1.5)
     pry (0.10.1)
@@ -210,7 +216,6 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
-    rbx-require-relative (0.0.9)
     rdoc (4.1.2)
       json (~> 1.4)
     redis (3.1.0)
@@ -230,28 +235,11 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.11.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     sequel (3.21.0)
     slop (3.6.0)
     spoon (0.0.4)
       ffi
-    sqlite3 (1.3.9)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
+    sqlite3 (1.3.10)
     stringex (1.5.1)
     thor (0.14.6)
     tzinfo (0.3.41)
@@ -269,6 +257,7 @@ DEPENDENCIES
   bundler
   couch_potato
   cucumber
+  database_cleaner!
   datamapper
   dm-migrations
   dm-sqlite-adapter
@@ -285,10 +274,10 @@ DEPENDENCIES
   ohm (~> 0.1.3)
   pg
   rake
-  rspec-rails
-  ruby-debug
-  ruby-debug19
+  rspec-rails (~> 2.11.0)
   sequel (~> 3.21.0)
   sqlite3
-  sqlite3-ruby
   tzinfo
+
+BUNDLED WITH
+   1.10.5

data/lib/database_cleaner/active_record/deletion.rb

@@ -54,14 +54,14 @@ module DatabaseCleaner::ActiveRecord
 
     def tables_with_new_rows(connection)
       @db_name ||= connection.instance_variable_get('@config')[:database]
-      result = connection.execute("SELECT table_name FROM information_schema.tables WHERE table_schema = '#{@db_name}' AND table_rows > 0")
-      result.map{ |row| row[0] } - ['schema_migrations']
+      result = connection.exec_query("SELECT table_name FROM information_schema.tables WHERE table_schema = '#{@db_name}' AND table_rows > 0")
+      result.map{ |row| row['table_name'] } - ['schema_migrations']
     end
 
     def information_schema_exists? connection
       @information_schema_exists ||=
         begin
-          connection.execute("SELECT * FROM information_schema.tables")
+          connection.execute("SELECT 1 FROM information_schema.tables")
           true
         rescue
           false

data/lib/database_cleaner/active_record/transaction.rb

@@ -27,24 +27,26 @@ module DatabaseCleaner::ActiveRecord
 
 
     def clean
-      return unless connection_class.connection.open_transactions > 0
+      connection_class.connection_pool.connections.each do |connection|
+        next unless connection.open_transactions > 0
 
-      if connection_class.connection.respond_to?(:rollback_transaction)
-        connection_class.connection.rollback_transaction
-      else
-        connection_class.connection.rollback_db_transaction
-      end
+        if connection.respond_to?(:rollback_transaction)
+          connection.rollback_transaction
+        else
+          connection.rollback_db_transaction
+        end
 
-      # The below is for handling after_commit hooks.. see https://github.com/bmabey/database_cleaner/issues/99
-      if connection_class.connection.respond_to?(:rollback_transaction_records, true)
-        connection_class.connection.send(:rollback_transaction_records, true)
-      end
+        # The below is for handling after_commit hooks.. see https://github.com/bmabey/database_cleaner/issues/99
+        if connection.respond_to?(:rollback_transaction_records, true)
+          connection.send(:rollback_transaction_records, true)
+        end
 
-      if connection_maintains_transaction_count?
-        if connection_class.connection.respond_to?(:decrement_open_transactions)
-          connection_class.connection.decrement_open_transactions
-        else
-          connection_class.__send__(:decrement_open_transactions)
+        if connection_maintains_transaction_count?
+          if connection.respond_to?(:decrement_open_transactions)
+            connection.decrement_open_transactions
+          else
+            connection_class.__send__(:decrement_open_transactions)
+          end
         end
       end
     end

data/lib/database_cleaner/active_record/truncation.rb

@@ -190,9 +190,9 @@ module DatabaseCleaner
         rows = select_rows <<-_SQL
           SELECT schemaname || '.' || tablename
           FROM pg_tables
-          WHERE 
-            tablename !~ '_prt_' AND 
-            tablename <> '#{::ActiveRecord::Migrator.schema_migrations_table_name}' AND 
+          WHERE
+            tablename !~ '_prt_' AND
+            tablename <> '#{::ActiveRecord::Migrator.schema_migrations_table_name}' AND
             schemaname = ANY (current_schemas(false))
         _SQL
         rows.collect { |result| result.first }
@@ -247,12 +247,12 @@ module DatabaseCleaner::ActiveRecord
       tables_in_db = cache_tables? ? connection.database_cleaner_table_cache : connection.tables
       to_reject = (@tables_to_exclude + connection.database_cleaner_view_cache)
       (@only || tables_in_db).reject do |table|
-          if ( m = table.match(/([^.]+)$/) )
-            to_reject.include?(m[1])
-          else
-            false
-          end
+        if ( m = table.match(/([^.]+)$/) )
+          to_reject.include?(m[1])
+        else
+          false
         end
+      end
     end
 
     # overwritten

data/lib/database_cleaner/configuration.rb

@@ -42,7 +42,7 @@ module DatabaseCleaner
 
     def connections
       # double yuck.. can't wait to deprecate this whole class...
-      unless @cleaners
+      unless defined?(@cleaners) && @cleaners
         autodetected = ::DatabaseCleaner::Base.new
         add_cleaner(autodetected.orm)
       end

data/lib/database_cleaner/generic/base.rb

@@ -1,26 +1,29 @@
 module ::DatabaseCleaner
-   module Generic
-     module Base
+  module Generic
+    module Base
 
-       def self.included(base)
-         base.extend(ClassMethods)
-       end
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-       def db
-         :default
-       end
+      def db
+        :default
+      end
 
-       def cleaning(&block)
-         start
-         yield
-         clean
-       end
+      def cleaning(&block)
+        begin
+          start
+          yield
+        ensure
+          clean
+        end
+      end
 
-       module ClassMethods
-         def available_strategies
-           %W[]
-         end
-       end
-     end
-   end
+      module ClassMethods
+        def available_strategies
+          %W[]
+        end
+      end
+    end
+  end
 end

data/lib/database_cleaner/mongo/truncation.rb

@@ -20,10 +20,7 @@ module DatabaseCleaner
       def mongoid_collection_names
         @@mongoid_collection_names ||= Hash.new{|h,k| h[k]=[]}.tap do |names|
           ObjectSpace.each_object(Class) do |klass|
-            next unless klass.ancestors.map(&:to_s).include?('Mongoid::Document')
-            next if klass.embedded
-            next if klass.collection_name.empty?
-            names[klass.db.name] << klass.collection_name
+            (names[klass.db.name] << klass.collection_name) if valid_collection_name?(klass)
           end
         end
       end
@@ -52,6 +49,14 @@ module DatabaseCleaner
 
         db_collections
       end
+
+      private
+
+      def valid_collection_name?(klass)
+        klass.ancestors.map(&:to_s).include?('Mongoid::Document') &&
+        !klass.embedded &&
+        !klass.collection_name.empty?
+      end
     end
   end
 end

data/lib/database_cleaner/mongoid/truncation.rb

@@ -1,6 +1,7 @@
 require 'database_cleaner/mongoid/base'
 require 'database_cleaner/generic/truncation'
 require 'database_cleaner/mongo/truncation_mixin'
+require 'database_cleaner/mongo2/truncation_mixin'
 require 'database_cleaner/moped/truncation_base'
 require 'mongoid/version'
 
@@ -20,7 +21,7 @@ module DatabaseCleaner
           ::Mongoid.database
         end
 
-      else
+      elsif ::Mongoid::VERSION < '5'
 
         include ::DatabaseCleaner::Moped::TruncationBase
 
@@ -37,6 +38,11 @@ module DatabaseCleaner
             ::Mongoid.database
           end
         end
+
+      else
+
+        include ::DatabaseCleaner::Mongo2::TruncationMixin
+
       end
     end
   end

data/lib/database_cleaner/moped/base.rb

@@ -25,6 +25,10 @@ module DatabaseCleaner
         @host ||= '127.0.0.1:27017'
       end
 
+      def db_version
+        @db_version ||= session.command('buildinfo' => 1)['version']
+      end
+
       private
 
       def session

data/lib/database_cleaner/moped/truncation_base.rb

@@ -23,9 +23,15 @@ module DatabaseCleaner
           session.use(db)
         end
 
-        session['system.namespaces'].find(:name => { '$not' => /\.system\.|\$/ }).to_a.map do |collection|
-          _, name = collection['name'].split('.', 2)
-          name
+        if db_version.split('.').first.to_i >= 3
+          session.command(listCollections: 1, filter: { 'name' => { '$not' => /.?system\.|\$/ } })['cursor']['firstBatch'].map do |collection|
+            collection['name']
+          end
+        else
+          session['system.namespaces'].find(name: { '$not' => /\.system\.|\$/ }).to_a.map do |collection|
+            _, name = collection['name'].split('.', 2)
+            name
+          end
         end
       end
 

data/lib/database_cleaner/neo4j/base.rb

@@ -50,8 +50,12 @@ module DatabaseCleaner
         database[:path]
       end
 
+      def db_params
+        database.reject!{|key, value| [:type, :path].include? key }
+      end
+
       def session
-        @session ||= ::Neo4j::Session.open(db_type, db_path)
+        @session ||= ::Neo4j::Session.open(db_type, db_path, db_params)
       end
     end
   end

data/spec/database_cleaner/active_record/transaction_spec.rb

@@ -7,7 +7,11 @@ module DatabaseCleaner
 
     describe Transaction do
       let (:connection) { double("connection") }
+      let (:connection_2) { double("connection") }
+      let (:connection_pool) { double("connection_pool")}
       before(:each) do
+        ::ActiveRecord::Base.stub(:connection_pool).and_return(connection_pool)
+        connection_pool.stub(:connections).and_return([connection])
         ::ActiveRecord::Base.stub(:connection).and_return(connection)
       end
 
@@ -82,6 +86,40 @@ module DatabaseCleaner
             ::ActiveRecord::Base.should_receive(:decrement_open_transactions)
             Transaction.new.clean
           end
+
+          it "should rollback open transactions in all connections" do
+            connection_pool.stub(:connections).and_return([connection, connection_2])
+
+            connection.should_receive(:open_transactions).and_return(1)
+            connection.stub(:respond_to?).with(:decrement_open_transactions).and_return(false)
+            connection.stub(:respond_to?).with(:rollback_transaction_records, true).and_return(false)
+            connection.stub(:respond_to?).with(:rollback_transaction).and_return(false)
+            connection.stub(:rollback_db_transaction)
+
+            connection_2.should_receive(:open_transactions).and_return(1)
+            connection_2.stub(:respond_to?).with(:decrement_open_transactions).and_return(false)
+            connection_2.stub(:respond_to?).with(:rollback_transaction_records, true).and_return(false)
+            connection_2.stub(:respond_to?).with(:rollback_transaction).and_return(false)
+            connection_2.stub(:rollback_db_transaction)
+
+            ::ActiveRecord::Base.should_receive(:decrement_open_transactions).twice
+            Transaction.new.clean
+          end
+
+          it "should rollback open transactions in all connections with an open transaction" do
+            connection_pool.stub(:connections).and_return([connection, connection_2])
+
+            connection.should_receive(:open_transactions).and_return(1)
+            connection.stub(:respond_to?).with(:decrement_open_transactions).and_return(false)
+            connection.stub(:respond_to?).with(:rollback_transaction_records, true).and_return(false)
+            connection.stub(:respond_to?).with(:rollback_transaction).and_return(false)
+            connection.stub(:rollback_db_transaction)
+
+            connection_2.should_receive(:open_transactions).and_return(0)
+
+            ::ActiveRecord::Base.should_receive(:decrement_open_transactions).exactly(1).times
+            Transaction.new.clean
+          end
         end
 
         context "automatic accounting of transaction count (AR 4)" do

data/spec/database_cleaner/generic/base_spec.rb

@@ -1,22 +1,61 @@
 require 'spec_helper'
 require 'database_cleaner/shared_strategy'
 require 'database_cleaner/generic/base'
+require 'active_record'
 
 module ::DatabaseCleaner
   module Generic
     class ExampleStrategy
       include ::DatabaseCleaner::Generic::Base
+
+      def start; end
     end
 
     describe ExampleStrategy do
       context "class methods" do
         subject { ExampleStrategy }
-        its(:available_strategies) { should be_empty }
+
+        describe "#available_strategies" do
+          it "should have available strategies" do
+            expect(subject.available_strategies).to be_empty
+          end
+        end
       end
 
       it_should_behave_like "a generic strategy"
 
-      its(:db) { should eq :default }
+      describe "#db" do
+        it "should be :default" do
+          expect(subject.db).to eql(:default)
+        end
+      end
+
+      describe "#cleaning" do
+        let (:connection) { double("connection") }
+        let (:strategy) { ExampleStrategy.new }
+        before do
+          # DatabaseCleaner.strategy = :truncation
+          connection.stub(:disable_referential_integrity).and_yield
+          connection.stub(:database_cleaner_view_cache).and_return([])
+          connection.stub(:database_cleaner_table_cache).and_return([])
+          ::ActiveRecord::Base.stub(:connection).and_return(connection)
+        end
+
+        it "calls #clean even if there is an exception" do
+          strategy.should_receive :clean
+          expect do
+            strategy.cleaning do
+              raise NoMethodError
+            end
+          end.to raise_exception(NoMethodError)
+        end
+
+        it "calls #clean after processing the block" do
+          strategy.should_receive :clean
+          strategy.cleaning do
+          end
+        end
+      end
     end
   end
 end

data/spec/database_cleaner/neo4j/base_spec.rb

@@ -24,6 +24,13 @@ module DatabaseCleaner
         subject.db.should eq db_conf
       end
 
+      it "should respect additional connection parameters" do
+        db_conf = {:type => :server_db, :path => 'http://localhost:7474', basic_auth: {username: 'user', password: 'pass'}}
+        subject.db = db_conf
+        stub_const("Neo4j::Session", double()).should_receive(:open).with(:server_db, 'http://localhost:7474', {basic_auth: {username: 'user', password: 'pass'}}) { true }
+        subject.start
+      end
+
       it "should default to nil" do
         subject.db.should be_nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Ben Mabey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord-mysql2-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-mysql2-adapter
+  name: datamapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: dm-migrations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: datamapper
+  name: dm-sqlite-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dm-migrations
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
+  name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: mongoid-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongo_ext
+  name: moped
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bson_ext
+  name: neo4j-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid-tree
+  name: couch_potato
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,21 +221,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongo_mapper
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.21.0
 - !ruby/object:Gem::Dependency
-  name: moped
+  name: ohm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +263,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: neo4j-core
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: couch_potato
+  name: mongo_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,33 +305,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.21.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.21.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -333,21 +361,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ohm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -508,7 +522,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -516,10 +530,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Strategies for cleaning databases.  Can be used to ensure a clean state for
   testing.
 test_files: []
-has_rdoc: