aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-07-12 01:04:53 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-04-26 22:53:55 -0700
commit2883d2dff6b54ead60717784e468436db91ff2d0 (patch)
treef3ad918925e2892ca56e9d294653a19b897e3adf
parent1583e260f9278986f3c4ea3702c081727838c290 (diff)
downloadrails-2883d2dff6b54ead60717784e468436db91ff2d0.tar.gz
rails-2883d2dff6b54ead60717784e468436db91ff2d0.tar.bz2
rails-2883d2dff6b54ead60717784e468436db91ff2d0.zip
Release minitest lock so we can fix the order dependent tests
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock3
2 files changed, 1 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 75a917e9cf..63bb37799e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,9 +94,6 @@ 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"
-
platforms :mri do
gem "stackprof"
gem "byebug"
diff --git a/Gemfile.lock b/Gemfile.lock
index 445bab1ca3..5d6845e6b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -215,7 +215,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
- minitest (5.3.3)
+ minitest (5.9.0)
mocha (0.14.0)
metaclass (~> 0.0.1)
mono_logger (1.1.0)
@@ -396,7 +396,6 @@ DEPENDENCIES
kindlerb (~> 1.2.0)
libxml-ruby
listen (>= 3.0.5, < 3.2)
- minitest (< 5.3.4)
mocha (~> 0.14)
mysql2 (>= 0.4.4)
nokogiri (>= 1.6.8)