aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/boot_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test/boot_test.rb')
-rw-r--r--railties/test/boot_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb
index 36fae307ca..0754777dd6 100644
--- a/railties/test/boot_test.rb
+++ b/railties/test/boot_test.rb
@@ -36,6 +36,7 @@ class BootTest < Test::Unit::TestCase
def test_boot_vendor_rails_by_default
Rails.expects(:booted?).returns(false)
+ Rails.expects(:preinitialize)
File.expects(:exist?).with("#{RAILS_ROOT}/vendor/rails").returns(true)
Rails::VendorBoot.any_instance.expects(:run).returns('result')
assert_equal 'result', Rails.boot!
@@ -43,6 +44,7 @@ class BootTest < Test::Unit::TestCase
def test_boot_gem_rails_otherwise
Rails.expects(:booted?).returns(false)
+ Rails.expects(:preinitialize)
File.expects(:exist?).with("#{RAILS_ROOT}/vendor/rails").returns(false)
Rails::GemBoot.any_instance.expects(:run).returns('result')
assert_equal 'result', Rails.boot!