diff options
author | Akira Matsuda <ronnie@dio.jp> | 2017-01-18 18:25:04 +0900 |
---|---|---|
committer | Akira Matsuda <ronnie@dio.jp> | 2017-01-18 18:27:05 +0900 |
commit | 8c155c932f37fd2de5b530bc076ed60a03bc926c (patch) | |
tree | 01152c3278793645edd99a51a058d3b3c4cb9652 | |
parent | c1d57f2dc9992628c92a711ebfefd8bcf46b1d2c (diff) | |
download | rails-8c155c932f37fd2de5b530bc076ed60a03bc926c.tar.gz rails-8c155c932f37fd2de5b530bc076ed60a03bc926c.tar.bz2 rails-8c155c932f37fd2de5b530bc076ed60a03bc926c.zip |
I guess we're ready for the randomized tests now
-rw-r--r-- | Gemfile | 3 | ||||
-rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -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) |