aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock4
2 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index e810e0357e..0b0d6210e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,8 +88,7 @@ local_gemfile = File.dirname(__FILE__) + "/.Gemfile"
instance_eval File.read local_gemfile if File.exist? local_gemfile
group :test do
- # FIX: Our test suite isn't ready to run in random order yet.
- gem "minitest", "< 5.3.4"
+ gem "minitest"
platforms :mri do
gem "stackprof"
diff --git a/Gemfile.lock b/Gemfile.lock
index 67b5f8c240..b8473dd19b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -198,6 +198,8 @@ GEM
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.9.17)
+ ffi (1.9.17-x64-mingw32)
+ ffi (1.9.17-x86-mingw32)
globalid (0.3.7)
activesupport (>= 4.1.0)
hiredis (0.6.1)
@@ -396,7 +398,7 @@ DEPENDENCIES
kindlerb (~> 1.2.0)
libxml-ruby
listen (>= 3.0.5, < 3.2)
- minitest (< 5.3.4)
+ minitest
mocha (~> 0.14)
mysql2 (>= 0.4.4)
nokogiri (>= 1.6.8)