Ticket #11590: check_that_vendor_rails_actually_exists_rather_than_just_its_directory.diff

File check_that_vendor_rails_actually_exists_rather_than_just_its_directory.diff, 1.5 kB (added by norbauer, 3 months ago)

a/railties/environments/boot.rb

old	new
21	21	end
22	22
23	23	def vendor_rails?
24		File.exist?("#{RAILS_ROOT}/vendor/rails")
	24	File.exist?("#{RAILS_ROOT}/vendor/rails/railties/lib/initializer")
25	25	end
26	26
27	27	def preinitialize

old	new
37	37	def test_boot_vendor_rails_by_default
38	38	Rails.expects(:booted?).returns(false)
39	39	Rails.expects(:preinitialize)
40		File.expects(:exist?).with("#{RAILS_ROOT}/vendor/rails").returns(true)
	40	File.expects(:exist?).with("#{RAILS_ROOT}/vendor/rails/railties/lib/initializer").returns(true)
41	41	Rails::VendorBoot.any_instance.expects(:run).returns('result')
42	42	assert_equal 'result', Rails.boot!
43	43	end
…	…
45	45	def test_boot_gem_rails_otherwise
46	46	Rails.expects(:booted?).returns(false)
47	47	Rails.expects(:preinitialize)
48		File.expects(:exist?).with("#{RAILS_ROOT}/vendor/rails").returns(false)
	48	File.expects(:exist?).with("#{RAILS_ROOT}/vendor/rails/railties/lib/initializer").returns(false)
49	49	Rails::GemBoot.any_instance.expects(:run).returns('result')
50	50	assert_equal 'result', Rails.boot!
51	51	end