aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/configuration
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-28 16:17:37 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-31 13:57:24 -0300
commit5da4d5142a60edda0cb78071553993ee33bb8637 (patch)
tree7c9f025bb50cd918c176a429749d221caa27802e /railties/test/configuration
parenteb4930e3c724cf71d6ce5bb2aec4af82b2025b03 (diff)
downloadrails-5da4d5142a60edda0cb78071553993ee33bb8637.tar.gz
rails-5da4d5142a60edda0cb78071553993ee33bb8637.tar.bz2
rails-5da4d5142a60edda0cb78071553993ee33bb8637.zip
Add active_support/testing/autorun
minitest/autorun load minitest/spec polluting the global namespace with the DSL that we don't want on Rails
Diffstat (limited to 'railties/test/configuration')
-rw-r--r--railties/test/configuration/middleware_stack_proxy_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/configuration/middleware_stack_proxy_test.rb b/railties/test/configuration/middleware_stack_proxy_test.rb
index 5984c0b425..2442cb995d 100644
--- a/railties/test/configuration/middleware_stack_proxy_test.rb
+++ b/railties/test/configuration/middleware_stack_proxy_test.rb
@@ -1,6 +1,7 @@
-require 'minitest/autorun'
+require 'active_support/testing/autorun'
require 'rails/configuration'
require 'active_support/test_case'
+require 'minitest/mock'
module Rails
module Configuration