From c5f6e038daf2221ddd5a7534e68f4158d84a5975 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 1 Sep 2009 10:27:19 -0500 Subject: ActionPack test helpers need to activate rack gem --- actionpack/test/abstract_unit.rb | 7 ++++--- actionpack/test/new_base/test_helper.rb | 4 ++++ actionpack/test/old_base/abstract_unit.rb | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 07dc282105..a5222fc96d 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -11,11 +11,12 @@ ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp') ENV['new_base'] = "true" $stderr.puts "Running old tests on new_base" +require 'rubygems' +gem "rack", "~> 1.0.0" +gem "rack-test", "~> 0.4.2" + require 'test/unit' require 'active_support' - -gem "rack-test" - require 'active_support/test_case' require 'action_controller' require 'fixture_template' diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb index b7ccd3db8d..0833e1a11d 100644 --- a/actionpack/test/new_base/test_helper.rb +++ b/actionpack/test/new_base/test_helper.rb @@ -2,6 +2,10 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib') $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') $:.unshift(File.dirname(__FILE__) + '/../lib') +require 'rubygems' +gem "rack", "~> 1.0.0" +gem "rack-test", "~> 0.4.2" + require 'test/unit' require 'active_support' require 'active_support/test_case' diff --git a/actionpack/test/old_base/abstract_unit.rb b/actionpack/test/old_base/abstract_unit.rb index 3301041a41..b80050bd48 100644 --- a/actionpack/test/old_base/abstract_unit.rb +++ b/actionpack/test/old_base/abstract_unit.rb @@ -8,6 +8,9 @@ $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers') require 'rubygems' +gem "rack", "~> 1.0.0" +gem "rack-test", "~> 0.4.2" + require 'yaml' require 'stringio' require 'test/unit' -- cgit v1.2.3