@@ -261,7 +261,11 @@ private if !defined?(Dispatcher) require 'dispatcher' end - require_dependency 'application' + if File.exist?('app/controllers/application_controller.rb') + require_dependency 'application_controller' + else + require_dependency 'application' + end if GC.copy_on_write_friendly? Dir.glob('app/{models,controllers,helpers}/*.rb').each do |file| require_dependency normalize_path(file) lib/passenger/railz/application_spawner.rb @@ -34,4 +34,12 @@ shared_examples_for "a minimal spawner" do environment.should == "development" end end + + it "loads application_controller.rb instead of application.rb, if the former exists" do + use_rails_stub('foobar') do |stub| + File.rename("#{stub.app_root}/app/controllers/application.rb", + "#{stub.app_root}/app/controllers/application_controller.rb") + lambda { spawn_stub_application(stub).close }.should_not raise_error + end + end end test/ruby/rails/minimal_spawner_spec.rb 4599027eeb9647a25258d97d829204d093826e35 Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/1301af69f5bb8b050dc888566b0c9aa52419ccb1 1301af69f5bb8b050dc888566b0c9aa52419ccb1 2008-11-22T05:48:04-08:00 2008-11-22T05:48:04-08:00 Fix compatibility with Rails edge, in which application.rb was renamed to application_controller.rb. 589f10ef2ee934baa1c8ef8b8d009f43825731f4 Hongli Lai (Phusion) hongli@phusion.nl