aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-13 12:58:49 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-13 12:58:49 -0500
commit25f4129151070f8c237ea3092a5da59253a1a2fc (patch)
tree69c1e51f7da1076b9aadf35f7052140e4d172da0 /actionpack/test
parent870bf8950f606ef50d1b6418a63dd94cf6fbc99e (diff)
downloadrails-25f4129151070f8c237ea3092a5da59253a1a2fc.tar.gz
rails-25f4129151070f8c237ea3092a5da59253a1a2fc.tar.bz2
rails-25f4129151070f8c237ea3092a5da59253a1a2fc.zip
Need to declare optional dependencies from AS
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/abstract_controller/test_helper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/abstract_controller/test_helper.rb b/actionpack/test/abstract_controller/test_helper.rb
index ba4302d914..18e4d3c0e5 100644
--- a/actionpack/test/abstract_controller/test_helper.rb
+++ b/actionpack/test/abstract_controller/test_helper.rb
@@ -2,6 +2,9 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
$:.unshift(File.dirname(__FILE__) + '/../lib')
+bundler = File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment')
+require bundler if File.exist?("#{bundler}.rb")
+
require 'rubygems'
require 'test/unit'
require 'active_support'