aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-06 22:51:11 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-06 22:51:11 -0300
commit94248ffe1e6f815b8ffab4eb752b60c1e4459d25 (patch)
tree2dfee4a02677ccaf67e2a7685500e1bfab9d8184 /actionpack/lib/action_dispatch
parent686f94e7683db3f2e302a59d89293e46bb58b977 (diff)
downloadrails-94248ffe1e6f815b8ffab4eb752b60c1e4459d25.tar.gz
rails-94248ffe1e6f815b8ffab4eb752b60c1e4459d25.tar.bz2
rails-94248ffe1e6f815b8ffab4eb752b60c1e4459d25.zip
Use MiniTest::Assertions instead of Test::Unit::Assertions
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 26db8662a8..08b7ff49c2 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -4,7 +4,6 @@ require 'active_support/core_ext/kernel/singleton_class'
require 'active_support/core_ext/object/inclusion'
require 'active_support/core_ext/object/try'
require 'rack/test'
-require 'test/unit/assertions'
module ActionDispatch
module Integration #:nodoc:
@@ -127,7 +126,7 @@ module ActionDispatch
class Session
DEFAULT_HOST = "www.example.com"
- include Test::Unit::Assertions
+ include MiniTest::Assertions
include TestProcess, RequestHelpers, Assertions
%w( status status_message headers body redirect? ).each do |method|