Skip to content

Commit 6acfb83

Browse files
committed
strip capture_io
1 parent 38ee7ad commit 6acfb83

File tree

3 files changed

+14
-39
lines changed

3 files changed

+14
-39
lines changed

test/support/sprockets_helpers.rb

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,21 @@ def asset.fresh?(env); false; end
3737
end
3838

3939
def precompile_assets
40-
capture_io do
41-
# Changing directories is required because:
42-
# - assets:precompile runs webpacker:compile when availabled
43-
# - webpacker:compile depends on `./bin/webpack`, so `.` must be the app root
44-
Dir.chdir("./test/#{DUMMY_LOCATION}") do
40+
# Changing directories is required because:
41+
# - assets:precompile runs webpacker:compile when availabled
42+
# - webpacker:compile depends on `./bin/webpack`, so `.` must be the app root
43+
Dir.chdir("./test/#{DUMMY_LOCATION}") do
4544

46-
ENV['RAILS_GROUPS'] = 'assets' # required for Rails 3.2
47-
Rake::Task['assets:precompile'].reenable
45+
ENV['RAILS_GROUPS'] = 'assets' # required for Rails 3.2
46+
Rake::Task['assets:precompile'].reenable
4847

49-
if Rails::VERSION::MAJOR == 3
50-
Rake::Task['assets:precompile:all'].reenable
51-
Rake::Task['assets:precompile:primary'].reenable
52-
Rake::Task['assets:precompile:nondigest'].reenable
53-
end
54-
55-
Rake::Task['assets:precompile'].invoke
48+
if Rails::VERSION::MAJOR == 3
49+
Rake::Task['assets:precompile:all'].reenable
50+
Rake::Task['assets:precompile:primary'].reenable
51+
Rake::Task['assets:precompile:nondigest'].reenable
5652
end
53+
54+
Rake::Task['assets:precompile'].invoke
5755
end
5856

5957
if Rails.application.respond_to?(:assets_manifest)

test/support/webpacker_helpers.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ def compile
2121
return unless available?
2222
clear_webpacker_packs
2323
Dir.chdir("./test/#{DUMMY_LOCATION}") do
24-
capture_io do
25-
Rake::Task['webpacker:compile'].reenable
26-
Rake::Task['webpacker:compile'].invoke
27-
end
24+
Rake::Task['webpacker:compile'].reenable
25+
Rake::Task['webpacker:compile'].invoke
2826
end
2927
# Reload cached JSON manifest:
3028
manifest_refresh

test/test_helper.rb

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,6 @@ def reset_transformer
5757
React::JSX.transformer = nil
5858
end
5959

60-
# Rails 3.2's version of MiniTest does not have `capture_io` defined. For
61-
# consistency across multiple versions we've defined that method here.
62-
#
63-
def capture_io
64-
require 'stringio'
65-
66-
orig_stdout = $stdout
67-
orig_stderr = $stderr
68-
captured_stdout = StringIO.new
69-
captured_stderr = StringIO.new
70-
$stdout = captured_stdout
71-
$stderr = captured_stderr
72-
73-
yield
74-
75-
return captured_stdout.string, captured_stderr.string
76-
ensure
77-
$stdout = orig_stdout
78-
$stderr = orig_stderr
79-
end
80-
8160
# Load support files
8261
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
8362

0 commit comments

Comments
 (0)