From 5ba9f888ccbbb8c8b4784e79682c941edbe00fe1 Mon Sep 17 00:00:00 2001
From: Steve Richert <steve.richert@gmail.com>
Date: Tue, 24 Jun 2014 10:24:36 -0400
Subject: [PATCH] Fix intermittent MongoMapper test suite failures

---
 spec/support/adapters/mongo_mapper/connection.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/support/adapters/mongo_mapper/connection.rb b/spec/support/adapters/mongo_mapper/connection.rb
index 2f817b2..f83289c 100644
--- a/spec/support/adapters/mongo_mapper/connection.rb
+++ b/spec/support/adapters/mongo_mapper/connection.rb
@@ -1,3 +1,12 @@
+# We need to require "active_support" first here because MongoMapper requires
+# "active_support/core_ext" without first requiring "active_support". On some
+# systems, this causes intermittent test suite failures.
+#
+# See: https://github.com/rails/rails/issues/14664
+# and: https://github.com/mongomapper/mongomapper/commit/64f9fc6
+#
+require "active_support"
+
 require "mongo_mapper"
 
 MongoMapper.connection = Mongo::Connection.new