aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-11-25 14:45:12 -0800
committerCarl Lerche <carllerche@mac.com>2009-11-25 14:45:12 -0800
commit25b8e996bd29384d37df9939cd651b550e709ee7 (patch)
treea04785401640a434f73709d374753afcbf7f8503
parent34eac1cf1cf52784b4c344b44034d98adebdcc28 (diff)
downloadrails-25b8e996bd29384d37df9939cd651b550e709ee7.tar.gz
rails-25b8e996bd29384d37df9939cd651b550e709ee7.tar.bz2
rails-25b8e996bd29384d37df9939cd651b550e709ee7.zip
Fix the rackup test to correctly use Rack::Builder.parse_file
-rw-r--r--railties/test/application/load_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/application/load_test.rb b/railties/test/application/load_test.rb
index dc5d03b323..e17f1ebdb0 100644
--- a/railties/test/application/load_test.rb
+++ b/railties/test/application/load_test.rb
@@ -8,7 +8,8 @@ module ApplicationTests
def rackup
require "rack"
- Rack::Builder.parse_file("#{app_path}/config.ru")
+ app, options = Rack::Builder.parse_file("#{app_path}/config.ru")
+ app
end
def setup