From f90160c6c1ec457f0b4b01c6fef78146271bc070 Mon Sep 17 00:00:00 2001 From: ddemaree Date: Fri, 2 Jan 2009 10:31:21 -0600 Subject: [PATCH] Fixed bug where calling app method from console would raise ArgumentError [#1629 state:resolved] Signed-off-by: Joshua Peek --- actionpack/lib/action_controller/integration.rb | 5 ++--- railties/test/console_app_test.rb | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index a8e54c2fc7e33..d9899112c37fa 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -81,8 +81,8 @@ class MultiPartNeededException < Exception 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 @@ def reset! # 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 diff --git a/railties/test/console_app_test.rb b/railties/test/console_app_test.rb index cbaf230594534..f419fe0d8d52c 100644 --- a/railties/test/console_app_test.rb +++ b/railties/test/console_app_test.rb @@ -14,6 +14,15 @@ class ApplicationController < ActionController::Base; end Test::Unit.run = false class ConsoleAppTest < Test::Unit::TestCase + def test_app_method_should_return_integration_session + assert_nothing_thrown do + console_session = app + assert_not_nil console_session + assert_instance_of ActionController::Integration::Session, + console_session + end + end + uses_mocha 'console reload test' do def test_reload_should_fire_preparation_callbacks a = b = c = nil