aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/test_help.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-09-08 15:38:51 -0300
committerEmilio Tagua <miloops@gmail.com>2009-09-08 15:38:51 -0300
commit670281c6b2e9b9e8c51a140f2a5f66b251f1b84b (patch)
treeab141872d72e010c8a0fe371d22a00914c97e1eb /railties/lib/test_help.rb
parent39e4e76d15233bb1cb0b778d920f54efe86bb4f0 (diff)
parent1a0f822037c408a392ffa7b6e1ecbe5951ab48db (diff)
downloadrails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.gz
rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.bz2
rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.zip
Merge commit 'rails/master'
Conflicts: activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/lib/test_help.rb')
-rw-r--r--railties/lib/test_help.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb
index 4318203a42..53f28264e8 100644
--- a/railties/lib/test_help.rb
+++ b/railties/lib/test_help.rb
@@ -2,6 +2,10 @@
# so fixtures are loaded to the right database
silence_warnings { RAILS_ENV = "test" }
+require 'rubygems'
+gem "rack", "~> 1.0.0"
+gem "rack-test", "~> 0.4.2"
+
require 'test/unit'
require 'active_support/core_ext/kernel/requires'
require 'action_controller/testing/test_case'