From ab9e4c0eaacba34c9f1d16cf34c82e0e906edad5 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 17 Dec 2007 18:54:55 +0000
Subject: Ruby 1.9 compatibility. References #1689.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8431 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
railties/test/boot_test.rb | 2 ++
1 file changed, 2 insertions(+)
(limited to 'railties/test')
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!
--
cgit v1.2.3