diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-05 18:28:51 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-05 18:28:51 -0200 |
commit | 6953f16efa364793b29686db032d32673134f4fd (patch) | |
tree | 45d7a4858bdba4630f6c1d1fc950b11c4f4cdd6a /railties/lib/rails | |
parent | 35e2255b7afd31f78d7d1978f3dff91f3dfed719 (diff) | |
parent | 166ce95f65cd6b54e23d43e0e61875d6c3a38047 (diff) | |
download | rails-6953f16efa364793b29686db032d32673134f4fd.tar.gz rails-6953f16efa364793b29686db032d32673134f4fd.tar.bz2 rails-6953f16efa364793b29686db032d32673134f4fd.zip |
Merge pull request #18526 from vipulnsward/add-silence-stream
Extracted silence_stream method to new module in activesupport/testing
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/generators/testing/behaviour.rb | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/railties/lib/rails/generators/testing/behaviour.rb b/railties/lib/rails/generators/testing/behaviour.rb index fd2ea274e1..c9700e1cd7 100644 --- a/railties/lib/rails/generators/testing/behaviour.rb +++ b/railties/lib/rails/generators/testing/behaviour.rb @@ -2,6 +2,7 @@ require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/hash/reverse_merge' require 'active_support/core_ext/kernel/reporting' +require 'active_support/testing/stream' require 'active_support/concern' require 'rails/generators' @@ -10,6 +11,7 @@ module Rails module Testing module Behaviour extend ActiveSupport::Concern + include ActiveSupport::Testing::Stream included do class_attribute :destination_root, :current_path, :generator_class, :default_arguments @@ -101,22 +103,6 @@ module Rails Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first end - 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 end end |