aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_unit.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-31 14:03:55 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-31 14:03:55 -0300
commitb22c527e65a41da59dbfcb078968069c6fae5086 (patch)
treefd50b9a5b79cf2e3cd508032aec320c0280b5b99 /actionpack/test/abstract_unit.rb
parent5e5107430bccc0a536e0b264c951793d8fe62235 (diff)
parentcf4afc4d11556609802f640135cc7715e4a6a9fe (diff)
downloadrails-b22c527e65a41da59dbfcb078968069c6fae5086.tar.gz
rails-b22c527e65a41da59dbfcb078968069c6fae5086.tar.bz2
rails-b22c527e65a41da59dbfcb078968069c6fae5086.zip
Merge branch 'minitest_cleanup'
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
-rw-r--r--actionpack/test/abstract_unit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 95bff0a204..bbcd289886 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -15,7 +15,7 @@ silence_warnings do
Encoding.default_external = "UTF-8"
end
-require 'minitest/autorun'
+require 'active_support/testing/autorun'
require 'abstract_controller'
require 'action_controller'
require 'action_view'