From d2a370a75069c0373f0520c5defb90c3954830cb Mon Sep 17 00:00:00 2001
From: Andrew Kane <acekane1@gmail.com>
Date: Fri, 30 Oct 2015 01:33:07 -0700
Subject: [PATCH] Fixed tests for ActiveRecord below 4.1

---
 test/index_test.rb  | 28 ++++++++++++----------------
 test/test_helper.rb |  4 ++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/index_test.rb b/test/index_test.rb
index 4eaeb0e..7be5f44 100644
--- a/test/index_test.rb
+++ b/test/index_test.rb
@@ -102,33 +102,29 @@ class IndexTest < Minitest::Test
     assert_raises(Searchkick::InvalidQueryError) { Product.search(query: {boom: true}) }
   end
 
-  def test_dangerous_reindex
-    skip if mongoid2? || nobrainer?
-    assert_raises(Searchkick::DangerousOperation) { Product.where(id: [1, 2, 3]).reindex }
-  end
+  unless mongoid2? || nobrainer? || activerecord_below41?
+    def test_dangerous_reindex
+      assert_raises(Searchkick::DangerousOperation) { Product.where(id: [1, 2, 3]).reindex }
+    end
 
-  def test_dangerous_reindex_accepted
-    skip if nobrainer?
-    store_names ["Product A", "Product B"]
-    Product.where(name: "Product A").reindex(accept_danger: true)
-    assert_search "product", ["Product A"]
-  end
+    def test_dangerous_reindex_accepted
+      store_names ["Product A", "Product B"]
+      Product.where(name: "Product A").reindex(accept_danger: true)
+      assert_search "product", ["Product A"]
+    end
 
-  def test_dangerous_reindex_inheritance
-    skip if mongoid2? || nobrainer?
-    assert_raises(Searchkick::DangerousOperation) { Dog.where(id: [1, 2, 3]).reindex }
+    def test_dangerous_reindex_inheritance
+      assert_raises(Searchkick::DangerousOperation) { Dog.where(id: [1, 2, 3]).reindex }
+    end
   end
 
   if defined?(ActiveRecord)
-
     def test_transaction
       Product.transaction do
         store_names ["Product A"]
         raise ActiveRecord::Rollback
       end
-
       assert_search "product", [], conversions: false
     end
-
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9375b62..1b191ae 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -30,6 +30,10 @@ def nobrainer?
   defined?(NoBrainer)
 end
 
+def activerecord_below41?
+  defined?(ActiveRecord) && ActiveRecord::VERSION < "4.1"
+end
+
 if defined?(Mongoid)
   Mongoid.logger.level = Logger::INFO
   Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger)
--
libgit2 0.21.0