diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-12-12 18:09:44 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-12-12 18:09:44 -0600 |
| commit | ee395fe626760e897abd9e881b54d3cc3f407d31 (patch) | |
| tree | 9d79bb4defa4c8a13009deb856e00c5125e63710 /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | 96deabace71d5cb3ee12c7b99e459db5e2acb1a6 (diff) | |
| download | rails-ee395fe626760e897abd9e881b54d3cc3f407d31.tar.gz rails-ee395fe626760e897abd9e881b54d3cc3f407d31.tar.bz2 rails-ee395fe626760e897abd9e881b54d3cc3f407d31.zip | |
TestProcess belongs in AD
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 40d6f97b2a..76021dc059 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -2,9 +2,8 @@ require 'stringio' require 'uri' require 'active_support/test_case' require 'active_support/core_ext/object/metaclass' - -# TODO: Remove circular dependency on ActionController -require 'action_controller/testing/process' +require 'action_dispatch/testing/test_process' +require 'rack/test' module ActionDispatch module Integration #:nodoc: @@ -128,9 +127,7 @@ module ActionDispatch DEFAULT_HOST = "www.example.com" include Test::Unit::Assertions - include ActionDispatch::Assertions - include ActionController::TestProcess - include RequestHelpers + include TestProcess, RequestHelpers, Assertions %w( status status_message headers body redirect? ).each do |method| delegate method, :to => :response, :allow_nil => true |