aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/integration.rb
diff options
context:
space:
mode:
authorddemaree <david@practical.cc>2009-01-02 10:31:21 -0600
committerJoshua Peek <josh@joshpeek.com>2009-01-02 10:31:21 -0600
commitf90160c6c1ec457f0b4b01c6fef78146271bc070 (patch)
tree7ba95a6b30cdc0e8fd38a8a63471be526e1a687e /actionpack/lib/action_controller/integration.rb
parenta1fb57aa6940253dbed5423ac3e064db272eab2a (diff)
downloadrails-f90160c6c1ec457f0b4b01c6fef78146271bc070.tar.gz
rails-f90160c6c1ec457f0b4b01c6fef78146271bc070.tar.bz2
rails-f90160c6c1ec457f0b4b01c6fef78146271bc070.zip
Fixed bug where calling app method from console would raise ArgumentError [#1629 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
-rw-r--r--actionpack/lib/action_controller/integration.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index a8e54c2fc7..d9899112c3 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -81,8 +81,8 @@ module ActionController
end
# Create and initialize a new Session instance.
- def initialize(app)
- @application = app
+ def initialize(app = nil)
+ @application = app || ActionController::Dispatcher.new
reset!
end
@@ -591,7 +591,6 @@ EOF
# can use this method to open multiple sessions that ought to be tested
# simultaneously.
def open_session(application = nil)
- application ||= ActionController::Dispatcher.new
session = Integration::Session.new(application)
# delegate the fixture accessors back to the test instance