Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed bug where calling app method from console would raise ArgumentE…

…rror [#1629 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
  • Loading branch information...
commit f90160c6c1ec457f0b4b01c6fef78146271bc070 1 parent a1fb57a
@ddemaree ddemaree authored josh committed
View
5 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
View
9 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
Please sign in to comment.
Something went wrong with that request. Please try again.