diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-31 14:03:55 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-31 14:03:55 -0300 |
| commit | b22c527e65a41da59dbfcb078968069c6fae5086 (patch) | |
| tree | fd50b9a5b79cf2e3cd508032aec320c0280b5b99 /railties/test/configuration/middleware_stack_proxy_test.rb | |
| parent | 5e5107430bccc0a536e0b264c951793d8fe62235 (diff) | |
| parent | cf4afc4d11556609802f640135cc7715e4a6a9fe (diff) | |
| download | rails-b22c527e65a41da59dbfcb078968069c6fae5086.tar.gz rails-b22c527e65a41da59dbfcb078968069c6fae5086.tar.bz2 rails-b22c527e65a41da59dbfcb078968069c6fae5086.zip | |
Merge branch 'minitest_cleanup'
Diffstat (limited to 'railties/test/configuration/middleware_stack_proxy_test.rb')
| -rw-r--r-- | railties/test/configuration/middleware_stack_proxy_test.rb | 3 |
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 |