aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/integration.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-06-13 00:21:03 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-06-14 02:04:38 -0700
commiteab71208db1afead6803501c8d51d77625e5ad6e (patch)
tree194e4911a90e5edf7af4c3c2990d6c0ad3645791 /actionpack/lib/action_controller/integration.rb
parentba0f38f89e8473490270957849d7d5b06f6ee65b (diff)
downloadrails-eab71208db1afead6803501c8d51d77625e5ad6e.tar.gz
rails-eab71208db1afead6803501c8d51d77625e5ad6e.tar.bz2
rails-eab71208db1afead6803501c8d51d77625e5ad6e.zip
Performance: integration test benchmarking and profiling. [Jeremy Kemper]
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
-rw-r--r--actionpack/lib/action_controller/integration.rb9
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