aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-05 18:28:51 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-05 18:28:51 -0200
commit6953f16efa364793b29686db032d32673134f4fd (patch)
tree45d7a4858bdba4630f6c1d1fc950b11c4f4cdd6a /railties/test/generators
parent35e2255b7afd31f78d7d1978f3dff91f3dfed719 (diff)
parent166ce95f65cd6b54e23d43e0e61875d6c3a38047 (diff)
downloadrails-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/test/generators')
-rw-r--r--railties/test/generators/generators_test_helper.rb20
1 files changed, 3 insertions, 17 deletions
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 7c5183e6c8..62ca0ecb4b 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -1,5 +1,6 @@
require 'abstract_unit'
require 'active_support/core_ext/module/remove_method'
+require 'active_support/testing/stream'
require 'rails/generators'
require 'rails/generators/test_case'
@@ -23,6 +24,8 @@ require 'action_dispatch'
require 'action_view'
module GeneratorsTestHelper
+ include ActiveSupport::Testing::Stream
+
def self.included(base)
base.class_eval do
destination File.join(Rails.root, "tmp")
@@ -42,21 +45,4 @@ module GeneratorsTestHelper
FileUtils.cp routes, destination
end
- def quietly
- silence_stream(STDOUT) do
- silence_stream(STDERR) do
- yield
- end
- end
- end
-
- def silence_stream(stream)
- old_stream = stream.dup
- stream.reopen(IO::NULL)
- stream.sync = true
- yield
- ensure
- stream.reopen(old_stream)
- old_stream.close
- end
end