diff options
| author | rick <technoweenie@gmail.com> | 2008-06-19 09:59:36 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-06-19 09:59:36 -0700 |
| commit | 10c581a6deed66e8b62de6e7a3621a63de90baad (patch) | |
| tree | 588ceb1118761602caa8ccf248dd08d59f33896c /actionpack/lib/action_controller/integration.rb | |
| parent | 64637da284ed4685591c178202ee103e6bee71cf (diff) | |
| parent | 81025b5808886289f54d698f73f4199c99223e7e (diff) | |
| download | rails-10c581a6deed66e8b62de6e7a3621a63de90baad.tar.gz rails-10c581a6deed66e8b62de6e7a3621a63de90baad.tar.bz2 rails-10c581a6deed66e8b62de6e7a3621a63de90baad.zip | |
fix merge
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index bd69d02ed7..18c2df8b37 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -1,9 +1,10 @@ -require 'stringio' -require 'uri' - +require 'active_support/test_case' require 'action_controller/dispatcher' require 'action_controller/test_process' +require 'stringio' +require 'uri' + module ActionController module Integration #:nodoc: # An integration Session instance represents a set of requests and responses @@ -580,7 +581,7 @@ EOF # end # end # end - class IntegrationTest < Test::Unit::TestCase + class IntegrationTest < ActiveSupport::TestCase include Integration::Runner # Work around a bug in test/unit caused by the default test being named |