aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-07-04 11:16:21 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-07-04 11:16:21 -0700
commit6f74d36c4263a6cbbc6dc32a03edeed04faefbd9 (patch)
treee7f6d460a5fabddea96d714dec2178cc7222e7b7
parenta66f498955edf8e000751ffc38d42be307adcef5 (diff)
downloadrails-6f74d36c4263a6cbbc6dc32a03edeed04faefbd9.tar.gz
rails-6f74d36c4263a6cbbc6dc32a03edeed04faefbd9.tar.bz2
rails-6f74d36c4263a6cbbc6dc32a03edeed04faefbd9.zip
activesupport gem dependencies should reflect the versions we actually use
-rw-r--r--Gemfile1
-rw-r--r--activesupport/activesupport.gemspec1
-rw-r--r--activesupport/lib/active_support/test_case.rb1
3 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 6bb6b03671..1c378c7a68 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,6 @@ else
gem 'arel'
end
-gem 'minitest', '~> 3.2.0'
gem 'mocha', '>= 0.11.2', :require => false
gem 'rack-test', github: "brynary/rack-test"
gem 'bcrypt-ruby', '~> 3.0.0'
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index fa38d5c1e3..836bc2f9cf 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
s.add_dependency('i18n', '~> 0.6')
s.add_dependency('multi_json', '~> 1.3')
s.add_dependency('tzinfo', '~> 0.3.33')
+ s.add_dependency('minitest', '~> 3.2')
end
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index b6abc3b561..a6f3b43792 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -1,3 +1,4 @@
+gem 'minitest' # make sure we get the gem, not stdlib
require 'minitest/spec'
require 'active_support/testing/setup_and_teardown'
require 'active_support/testing/assertions'