WIP: Test Mocha/Minitest compatibility fix

See freerange/mocha#614

Gemfile

@@ -86,7 +86,7 @@ group :test do
   gem "minitest"
   gem "minitest-fail-fast"
   gem "minitest-stub-const"
-  gem "mocha"
+  gem "mocha", github: "freerange/mocha", branch: "fix-minitest-compatibility"
   gem "rack-test"
   gem "rails-controller-testing"
   gem "simplecov", require: false

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/freerange/mocha.git
+  revision: 0be64b2f547a4c47a35e07a9128e30896cbb2887
+  branch: fix-minitest-compatibility
+  specs:
+    mocha (2.0.4)
+      ruby2_keywords (>= 0.0.5)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -403,12 +411,10 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
-    minitest (5.18.1)
+    minitest (5.19.0)
     minitest-fail-fast (0.1.0)
       minitest (~> 5)
     minitest-stub-const (0.6)
-    mocha (2.0.4)
-      ruby2_keywords (>= 0.0.5)
     msgpack (1.6.0)
     multi_json (1.15.0)
     multi_test (1.1.0)
@@ -995,7 +1001,7 @@ DEPENDENCIES
   minitest
   minitest-fail-fast
   minitest-stub-const
-  mocha
+  mocha!
   mysql2
   nokogiri
   pact