aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-10-16 19:04:28 -0500
committerJoshua Peek <josh@joshpeek.com>2009-10-16 19:04:28 -0500
commitc1261b5484c10930be9f737abfc164f9ba072629 (patch)
tree65e63de01ec16de8ddfe534c54bf637764195d41 /railties
parentd8594026962704b6b51e188a29406fbd22bb31ce (diff)
downloadrails-c1261b5484c10930be9f737abfc164f9ba072629.tar.gz
rails-c1261b5484c10930be9f737abfc164f9ba072629.tar.bz2
rails-c1261b5484c10930be9f737abfc164f9ba072629.zip
Use Rails.application where we want a valid rack app
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config.ru2
-rw-r--r--railties/test/application/load_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru
index f854029193..509a0da5b7 100644
--- a/railties/lib/rails/generators/rails/app/templates/config.ru
+++ b/railties/lib/rails/generators/rails/app/templates/config.ru
@@ -2,4 +2,4 @@
require ::File.expand_path('../config/environment', __FILE__)
# Dispatch the request
-run Rails.application.new
+run Rails.application
diff --git a/railties/test/application/load_test.rb b/railties/test/application/load_test.rb
index 5c3d35fb16..3da51c4355 100644
--- a/railties/test/application/load_test.rb
+++ b/railties/test/application/load_test.rb
@@ -40,7 +40,7 @@ module ApplicationTests
test "Rails.application is available after config.ru has been racked up" do
rackup
- assert Rails.application.new < Rails::Application
+ assert Rails.application < Rails::Application
end
# Passenger still uses AC::Dispatcher, so we need to