Permalink
Browse files

Need to declare optional dependencies from AS

  • Loading branch information...
1 parent 870bf89 commit 25f4129151070f8c237ea3092a5da59253a1a2fc @josh josh committed Sep 13, 2009
Showing with 10 additions and 1 deletion.
  1. +7 −1 actionpack/Gemfile
  2. +3 −0 actionpack/test/abstract_controller/test_helper.rb
View
@@ -9,6 +9,12 @@ only :test do
gem "mocha"
gem "sqlite3-ruby"
gem "RedCloth"
+
+ activesupport_vendor = rails_root.join('activesupport', 'lib', 'active_support', 'vendor')
+
+ gem 'builder', '2.1.2', :vendored_at => activesupport_vendor.join('builder-2.1.2')
+ gem 'memcache-client', '1.6.5', :vendored_at => activesupport_vendor.join('memcache-client-1.6.5')
+ gem 'tzinfo', '0.3.13', :vendored_at => activesupport_vendor.join('tzinfo-0.3.13')
end
-disable_system_gems
+disable_system_gems
@@ -2,6 +2,9 @@
$:.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'

0 comments on commit 25f4129

Please sign in to comment.