fix mongoid test on rails 5

scambra · Aug 5, 2016 · b0e7292 · b0e7292
1 parent 5f0f411
commit b0e7292
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -25,13 +25,15 @@ class ActionController::TestCase
   else
     include Devise::TestHelpers
   end
-  if Rails.version >= '5.0.0'
-    self.use_transactional_tests = true
-  elsif defined? ActiveRecord
-    begin
-      require 'test_after_commit' 
-      self.use_transactional_fixtures = true
-    rescue LoadError
+  if defined? ActiveRecord
+    if Rails.version >= '5.0.0'
+      self.use_transactional_tests = true
+    else
+      begin
+        require 'test_after_commit' 
+        self.use_transactional_fixtures = true
+      rescue LoadError
+      end
     end
   end
 end