diff options
author | Vipul A M <vipulnsward@gmail.com> | 2015-01-15 12:12:33 +0530 |
---|---|---|
committer | Vipul A M <vipulnsward@gmail.com> | 2015-01-20 22:28:48 +0530 |
commit | 166ce95f65cd6b54e23d43e0e61875d6c3a38047 (patch) | |
tree | 8ee4222277b604cd39b27b78e8db0b4a5087bb69 /railties/test/abstract_unit.rb | |
parent | 850159bd2c5e1e108d0256dd05424bbbf7926b59 (diff) | |
download | rails-166ce95f65cd6b54e23d43e0e61875d6c3a38047.tar.gz rails-166ce95f65cd6b54e23d43e0e61875d6c3a38047.tar.bz2 rails-166ce95f65cd6b54e23d43e0e61875d6c3a38047.zip |
- Extracted silence_stream method to new module in activesupport/testing.
- Added include for the same in ActiveSupport::Test.
- Removed occurrences of silence_stream being used elsewhere.
- Reordered activesupport testcase requires alphabetically.
- Removed require of silence stream from test_case
- Moved quietly method to stream helper
- Moved capture output to stream helper module and setup requires for the same elsewhere
Diffstat (limited to 'railties/test/abstract_unit.rb')
-rw-r--r-- | railties/test/abstract_unit.rb | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb index 0749615d03..ab8883e135 100644 --- a/railties/test/abstract_unit.rb +++ b/railties/test/abstract_unit.rb @@ -4,6 +4,7 @@ require File.expand_path("../../../load_paths", __FILE__) require 'stringio' require 'active_support/testing/autorun' +require 'active_support/testing/stream' require 'fileutils' require 'active_support' @@ -28,26 +29,10 @@ def jruby_skip(message = '') end class ActiveSupport::TestCase + include ActiveSupport::Testing::Stream + # FIXME: we have tests that depend on run order, we should fix that and # remove this method call. self.test_order = :sorted - private - - def capture(stream) - stream = stream.to_s - captured_stream = Tempfile.new(stream) - stream_io = eval("$#{stream}") - origin_stream = stream_io.dup - stream_io.reopen(captured_stream) - - yield - - stream_io.rewind - return captured_stream.read - ensure - captured_stream.close - captured_stream.unlink - stream_io.reopen(origin_stream) - end end |