From a594bda9f2a1dca6a3c1001b2c7c7a00fc7bf0c5 Mon Sep 17 00:00:00 2001
From: Micah Geisel <micah@botandrose.com>
Date: Mon, 23 Apr 2018 19:40:10 -0700
Subject: [PATCH] bump mongo to fix and re-enable disabled mongo and
 mongo_mapper specs.

---
 .travis.yml                                         |  2 +-
 Gemfile.lock                                        | 13 +++++++------
 database_cleaner.gemspec                            |  1 +
 spec/database_cleaner/mongo/truncation_spec.rb      |  6 +++---
 .../mongo_mapper/truncation_spec.rb                 |  6 +++---
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d1c983..1b5b6e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ rvm:
   - 2.2
 script:
   - bundle exec rspec
-  # - bundle exec cucumber
+  - bundle exec cucumber
 gemfile:
   - Gemfile
 before_install:
diff --git a/Gemfile.lock b/Gemfile.lock
index c6cb5e8..f57bdb6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,10 +38,10 @@ GEM
       bcrypt (>= 3.1.3)
     bcrypt-ruby (3.1.5-java)
       bcrypt (>= 3.1.3)
-    bson (1.11.1)
-    bson (1.11.1-java)
-    bson_ext (1.11.1)
-      bson (~> 1.11.1)
+    bson (1.12.5)
+    bson (1.12.5-java)
+    bson_ext (1.12.5)
+      bson (~> 1.12.5)
     builder (2.1.2)
     coderay (1.1.0)
     couch_potato (1.3.0)
@@ -151,8 +151,8 @@ GEM
     lumberjack (1.0.9)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mongo (1.11.1)
-      bson (= 1.11.1)
+    mongo (1.12.5)
+      bson (= 1.12.5)
     mongo_ext (0.19.3)
     mongo_mapper (0.12.0)
       activemodel (~> 3.0)
@@ -266,6 +266,7 @@ DEPENDENCIES
   dm-sqlite-adapter
   guard-rspec
   json_pure
+  mongo (~> 1.12.0)
   mongo_ext
   mongo_mapper
   mongoid
diff --git a/database_cleaner.gemspec b/database_cleaner.gemspec
index 90d7804..831af16 100644
--- a/database_cleaner.gemspec
+++ b/database_cleaner.gemspec
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "tzinfo"
   s.add_development_dependency "mongoid-tree"
   s.add_development_dependency "mongo_mapper"
+  s.add_development_dependency "mongo", "~> 1.12.0"
   s.add_development_dependency "moped"
   s.add_development_dependency "neo4j-core"
   s.add_development_dependency "couch_potato"
diff --git a/spec/database_cleaner/mongo/truncation_spec.rb b/spec/database_cleaner/mongo/truncation_spec.rb
index 139ddb0..6736eeb 100644
--- a/spec/database_cleaner/mongo/truncation_spec.rb
+++ b/spec/database_cleaner/mongo/truncation_spec.rb
@@ -37,7 +37,7 @@ module DatabaseCleaner
         MongoTest::Gadget.new({:name => 'some gadget'}.merge(attrs)).save!
       end
 
-      xit "truncates all collections by default" do
+      it "truncates all collections by default" do
         create_widget
         create_gadget
         ensure_counts(MongoTest::Widget => 1, MongoTest::Gadget => 1)
@@ -47,7 +47,7 @@ module DatabaseCleaner
 
       context "when collections are provided to the :only option" do
         let(:args) {{:only => ['MongoTest::Widget']}}
-        xit "only truncates the specified collections" do
+        it "only truncates the specified collections" do
           create_widget
           create_gadget
           ensure_counts(MongoTest::Widget => 1, MongoTest::Gadget => 1)
@@ -58,7 +58,7 @@ module DatabaseCleaner
 
       context "when collections are provided to the :except option" do
         let(:args) {{:except => ['MongoTest::Widget']}}
-        xit "truncates all but the specified collections" do
+        it "truncates all but the specified collections" do
           create_widget
           create_gadget
           ensure_counts(MongoTest::Widget => 1, MongoTest::Gadget => 1)
diff --git a/spec/database_cleaner/mongo_mapper/truncation_spec.rb b/spec/database_cleaner/mongo_mapper/truncation_spec.rb
index 78939f7..fc26734 100644
--- a/spec/database_cleaner/mongo_mapper/truncation_spec.rb
+++ b/spec/database_cleaner/mongo_mapper/truncation_spec.rb
@@ -41,7 +41,7 @@ module DatabaseCleaner
         Gadget.new({:name => 'some gadget'}.merge(attrs)).save!
       end
 
-      xit "truncates all collections by default" do
+      it "truncates all collections by default" do
         create_widget
         create_gadget
         ensure_counts(Widget => 1, Gadget => 1, :sanity_check => true)
@@ -50,7 +50,7 @@ module DatabaseCleaner
       end
 
       context "when collections are provided to the :only option" do
-        xit "only truncates the specified collections" do
+        it "only truncates the specified collections" do
           create_widget
           create_gadget
           ensure_counts(Widget => 1, Gadget => 1, :sanity_check => true)
@@ -60,7 +60,7 @@ module DatabaseCleaner
       end
 
       context "when collections are provided to the :except option" do
-        xit "truncates all but the specified collections" do
+        it "truncates all but the specified collections" do
           create_widget
           create_gadget
           ensure_counts(Widget => 1, Gadget => 1, :sanity_check => true)