diff options
| author | John Dzak <john.dzak@gmail.com> | 2009-03-12 15:04:07 -0500 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-13 10:13:57 +0000 |
| commit | 9d906707bea997016fd370e33e12dbc21cfcc531 (patch) | |
| tree | f08fc40ba3de949d28e9fa5e1a21f0b1a8aafcce /railties | |
| parent | 5f1d6465b47333db730a4bb4ac3d2a083b7c8f3c (diff) | |
| download | rails-9d906707bea997016fd370e33e12dbc21cfcc531.tar.gz rails-9d906707bea997016fd370e33e12dbc21cfcc531.tar.bz2 rails-9d906707bea997016fd370e33e12dbc21cfcc531.zip | |
Vendored gem paths now being loaded if they exist [#2204 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/environments/boot.rb | 1 | ||||
| -rw-r--r-- | 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 0a516880ca..0ad0f787f8 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_path end end diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb index 16776af098..08fcc82e6f 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_path) boot.load_initializer end end |