diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-01-18 20:52:21 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2017-01-18 20:52:21 +0900 |
| commit | 641a490e56309828ea4dcf34ebe9b457d648dd54 (patch) | |
| tree | 8db4e3bf0a6cd9610d78304ebfeaa36e6e15cfca | |
| parent | c49cc4ae35e583048d4fcde337e83aa86a3ef80c (diff) | |
| download | rails-641a490e56309828ea4dcf34ebe9b457d648dd54.tar.gz rails-641a490e56309828ea4dcf34ebe9b457d648dd54.tar.bz2 rails-641a490e56309828ea4dcf34ebe9b457d648dd54.zip | |
Revert "I guess we're ready for the randomized tests now"
This reverts commit 8c155c932f37fd2de5b530bc076ed60a03bc926c.
Not really :cry:
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 4 deletions
@@ -88,7 +88,8 @@ local_gemfile = File.dirname(__FILE__) + "/.Gemfile" instance_eval File.read local_gemfile if File.exist? local_gemfile group :test do - gem "minitest" + # FIX: Our test suite isn't ready to run in random order yet. + gem "minitest", "< 5.3.4" platforms :mri do gem "stackprof" diff --git a/Gemfile.lock b/Gemfile.lock index b8473dd19b..67b5f8c240 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -198,8 +198,6 @@ 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) @@ -398,7 +396,7 @@ DEPENDENCIES kindlerb (~> 1.2.0) libxml-ruby listen (>= 3.0.5, < 3.2) - minitest + minitest (< 5.3.4) mocha (~> 0.14) mysql2 (>= 0.4.4) nokogiri (>= 1.6.8) |