aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-22 17:29:25 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-22 17:29:25 -0800
commitec095456d859da4a09c7401585c211dc0f01fccd (patch)
treee11b371a3cc1340b7ae3a877d2951e3716a7961d
parentfe5f66041395f7afa0359af6b075604c63574c85 (diff)
downloadrails-ec095456d859da4a09c7401585c211dc0f01fccd.tar.gz
rails-ec095456d859da4a09c7401585c211dc0f01fccd.tar.bz2
rails-ec095456d859da4a09c7401585c211dc0f01fccd.zip
Dont auto require rubygems, move dep on rack-test to Gemfile
-rw-r--r--Gemfile1
-rw-r--r--railties/lib/rails/test_help.rb5
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index d979add5b3..8a5119de8d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,7 @@ gem "mysql", ">= 2.8.1"
# AP
gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git"
+gem "rack-test", "0.5.3"
gem "RedCloth", ">= 4.2.2"
if ENV['CI']
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index b89b7b5c27..2601765065 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -2,9 +2,8 @@
# so fixtures are loaded to the right database
silence_warnings { RAILS_ENV = "test" }
-require 'rubygems'
-gem "rack", "~> 1.0.0"
-gem "rack-test", "~> 0.5.0"
+require 'rack'
+require 'rack/test'
require 'test/unit'
require 'active_support/core_ext/kernel/requires'