github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-27 07:17:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Integration tests use ActionController::Dispatcher rather than the old Dispatcher. Closes #10596.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8483 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2007-12-22 19:03:01 +00:00
parent c64a29f6f1
commit fa906778ff
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/action_controller/integration.rb
View File

@@ -1,6 +1,7 @@
require 'dispatcher'
require 'stringio'
require 'uri'
require 'action_controller/dispatcher'
require 'action_controller/test_process'
module ActionController
@@ -276,7 +277,7 @@ module ActionController
ActionController::Base.clear_last_instantiation!
cgi = StubCGI.new(env, data)
Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput)
ActionController::Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput)
@result = cgi.stdoutput.string
@request_count += 1

1
actionpack/test/controller/integration_test.rb
View File

@@ -1,6 +1,5 @@
require File.dirname(__FILE__) + '/../abstract_unit'
$:.unshift File.dirname(__FILE__) + '/../../../railties/lib'
require 'action_controller/integration'
uses_mocha 'integration' do