From 1e29182d4e3ef33b3fe8c42f3d832e5294967489 Mon Sep 17 00:00:00 2001 From: John Dzak Date: Thu, 12 Mar 2009 15:04:07 -0500 Subject: [PATCH] Vendored gem paths now being loaded if they exist. --- railties/environments/boot.rb | 1 + railties/test/boot_test.rb | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb index 0a51688..c3b8e44 100644 --- a/railties/environments/boot.rb +++ b/railties/environments/boot.rb @@ -44,6 +44,7 @@ module Rails def load_initializer require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" Rails::Initializer.run(:install_gem_spec_stubs) + Rails::GemDependency.add_frozen_gem_paths end end diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb index 16776af..0f83356 100644 --- a/railties/test/boot_test.rb +++ b/railties/test/boot_test.rb @@ -62,6 +62,8 @@ class VendorBootTest < Test::Unit::TestCase def test_load_initializer_requires_from_vendor_rails boot = VendorBoot.new boot.expects(:require).with("#{RAILS_ROOT}/vendor/rails/railties/lib/initializer") + Rails::Initializer.expects(:run).with(:install_gem_spec_stubs) + Rails::GemDependency.expects(:add_frozen_gem_paths) boot.load_initializer end end -- 1.6.1.2