8000 Use capture_output instead of capture_io. · rubygems/rubygems@ad9206d · GitHub
[go: up one dir, main page]
Skip to content

Commit ad9206d

Browse files
hsbthsbt
committed
Use capture_output instead of capture_io.
1 parent a857152 commit ad9206d

12 files changed

+33
-33
lines changed

‎test/rubygems/test_deprecate.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def bar_kwarg(message:)
9696
end
9797

9898
def test_deprecated_method_calls_the_old_method
99-
capture_io do
99+
capture_output do
100100
thing = Thing.new
101101
thing.foo
102102
assert_equal "foo", thing.message
@@ -108,7 +108,7 @@ def test_deprecated_method_calls_the_old_method
108108
end
109109

110110
def test_deprecated_method_outputs_a_warning
111-
out, err = capture_io do
111+
out, err = capture_output do
112112
thing = Thing.new
113113
thing.foo
114114
thing.foo_arg("msg")

‎test/rubygems/test_gem.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@ def test_self_try_activate_missing_extensions
13891389
io.write spec.to_ruby_for_cache
13901390
end
13911391

1392-
_, err = capture_io do
1392+
_, err = capture_output do
13931393
refute Gem.try_activate 'nonexistent'
13941394
end
13951395

@@ -1414,7 +1414,7 @@ def test_self_use_paths_with_nils
14141414
end
14151415

14161416
def test_setting_paths_does_not_warn_about_unknown_keys
1417-
stdout, stderr = capture_io do
1417+
stdout, stderr = capture_output do
14181418
Gem.paths = { 'foo' => [],
14191419
'bar' => Object.new,
14201420
'GEM_HOME' => Gem.paths.home,
@@ -1432,7 +1432,7 @@ def test_setting_paths_does_not_mutate_parameter_object
14321432
end
14331433

14341434
def test_deprecated_paths=
1435-
stdout, stderr = capture_io do
1435+
stdout, stderr = capture_output do
14361436
Gem.paths = { 'GEM_HOME' => Gem.paths.home,
14371437
'GEM_PATH' => [Gem.paths.home, 'foo'] }
14381438
end
@@ -2073,7 +2073,7 @@ def with_plugin(path)
20732073
refute_includes $LOAD_PATH, test_plugin_path
20742074
$LOAD_PATH.unshift test_plugin_path
20752075

2076-
capture_io do
2076+
capture_output do
20772077
yield
20782078
end
20792079
ensure

‎test/rubygems/test_gem_commands_build_command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def test_execute_bad_spec
208208
@cmd.options[:args] = [gemspec_file]
209209

210210
out, err = use_ui @ui do
211-
capture_io do
211+
capture_output do
212212
assert_raises Gem::MockGemUi::TermError do
213213
@cmd.execute
214214
end

‎test/rubygems/test_gem_commands_check_command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def test_doctor
5555

5656
Gem.use_paths @gemhome
5757

58-
capture_io do
58+
capture_output do
5959
use_ui @ui do
6060
@cmd.doctor
6161
end

‎test/rubygems/test_gem_config_file.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def test_handle_arguments_debug
253253

254254
args = %w[--debug]
255255

256-
_, err = capture_io do
256+
_, err = capture_output do
257257
@cfg.handle_arguments args
258258
end
259259

‎test/rubygems/test_gem_doctor.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_doctor
3838

3939
doctor = Gem::Doctor.new @gemhome
4040

41-
capture_io do
41+
capture_output do
4242
use_ui @ui do
4343
doctor.doctor
4444
end
@@ -91,7 +91,7 @@ def test_doctor_dry_run
9191

9292
doctor = Gem::Doctor.new @gemhome, true
9393

94-
capture_io do
94+
capture_output do
9595
use_ui @ui do
9696
doctor.doctor
9797
end
@@ -127,7 +127,7 @@ def test_doctor_non_gem_home
127127

128128
doctor = Gem::Doctor.new @tempdir
129129

130-
capture_io do
130+
capture_output do
131131
use_ui @ui do
132132
doctor.doctor
133133
end

‎test/rubygems/test_gem_request_set_gem_dependency_api.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def test_gem
8181
def test_gem_duplicate
8282
@gda.gem 'a'
8383

84-
_, err = capture_io do
84+
_, err = capture_output do
8585
@gda.gem 'a'
8686
end
8787

@@ -129,7 +129,7 @@ def test_gem_bitbucket_expand_path
129129
end
130130

131131
def test_gem_git_branch
132-
_, err = capture_io do
132+
_, err = capture_output do
133133
@gda.gem 'a', :git => 'git/a', :branch => 'other', :tag => 'v1'
134134
end
135135
expected = "Gem dependencies file gem.deps.rb includes git reference for both ref/branch and tag but only ref/branch is used."
@@ -150,7 +150,7 @@ def test_gem_git_gist
150150
end
151151

152152
def test_gem_git_ref
153-
_, err = capture_io do
153+
_, err = capture_output do
154154
@gda.gem 'a', :git => 'git/a', :ref => 'abcd123', :branch => 'other'
155155
end
156156
expected = "Gem dependencies file gem.deps.rb includes git reference for both ref and branch but only ref is used."
@@ -518,7 +518,7 @@ def test_gemspec_bad
518518
FileUtils.touch 'a.gemspec'
519519

520520
e = assert_raises ArgumentError do
521-
capture_io do
521+
capture_output do
522522
@gda.gemspec
523523
end
524524
end

‎test/rubygems/test_gem_server.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def test_latest_specs_gz
133133
def test_listen
134134
util_listen
135135

136-
capture_io do
136+
capture_output do
137137
@server.liste 1C6A n
138138
end
139139

@@ -143,7 +143,7 @@ def test_listen
143143
def test_listen_addresses
144144
util_listen
145145

146-
capture_io do
146+
capture_output do
147147
@server.listen %w[a b]
148148
end
149149

‎test/rubygems/test_gem_silent_ui.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def teardown
1616

1717
def test_ask
1818
value = nil
19-
out, err = capture_io do
19+
out, err = capture_output do
2020
use_ui @sui do
2121
value = @sui.ask 'Problem?'
2222
end
@@ -30,7 +30,7 @@ def test_ask
3030

3131
def test_ask_for_password
3232
value = nil
33-
out, err = capture_io do
33+
out, err = capture_output do
3434
use_ui @sui do
3535
value = @sui.ask_for_password 'Problem?'
3636
end
@@ -44,7 +44,7 @@ def test_ask_for_password
4444

4545
def test_ask_yes_no
4646
value = nil
47-
out, err = capture_io do
47+
out, err = capture_output do
4848
use_ui @sui do
4949
assert_raises(Gem::OperationNotSupportedError) do
5050
@sui.ask_yes_no 'Problem?'
@@ -55,7 +55,7 @@ def test_ask_yes_no
5555
assert_empty out, 'No output'
5656
assert_empty err, 'No output'
5757

58-
out, err = capture_io do
58+
out, err = capture_output do
5959
use_ui @sui do
6060
value = @sui.ask_yes_no 'Problem?', true
6161
end
@@ -66,7 +66,7 @@ def test_ask_yes_no
6666

6767
assert value, 'Value is true'
6868

69-
out, err = capture_io do
69+
out, err = capture_output do
7070
use_ui @sui do
7171
value = @sui.ask_yes_no 'Problem?', false
7272
end
@@ -80,7 +80,7 @@ def test_ask_yes_no
8080

8181
def test_choose_from_list
8282
value = nil
83-
out, err = capture_io do
83+
out, err = capture_output do
8484
use_ui @sui do
8585
value = @sui.choose_from_list 'Problem?', %w[yes no]
8686
end
@@ -93,7 +93,7 @@ def test_choose_from_list
9393
end
9494

9595
def test_progress_reporter
96-
out, err = capture_io do
96+
out, err = capture_output do
9797
use_ui @sui do
9898
@sui.progress_reporter 10, 'hi'
9999
end
@@ -104,7 +104,7 @@ def test_progress_reporter
104104
end
105105

106106
def test_download_reporter
107-
out, err = capture_io do
107+
out, err = capture_output do
108108
use_ui @sui do
109109
@sui.download_reporter.fetch 'a.gem', 1024
110110
end

‎test/rubygems/test_gem_source_git.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ def test_specs
240240

241241
specs = nil
242242

243-
capture_io do
243+
capture_output do
244244
specs = source.specs
245245
end
246246

@@ -275,7 +275,7 @@ def test_specs_local
275275
source = Gem::Source::Git.new @name, @repository, 'master', true
276276
source.remote = false
277277

278-
capture_io do
278+
capture_output do
279279
assert_empty source.specs
280280
end
281281
end

‎test/rubygems/test_gem_specification.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ def test_contains_requirable_file_eh_extension
16691669
skip "extensions don't quite work on jruby" if Gem.java_platform?
16701670
ext_spec
16711671

1672-
_, err = capture_io do
1672+
_, err = capture_output do
16731673
refute @ext.contains_requirable_file? 'nonexistent'
16741674
end
16751675

@@ -1682,7 +1682,7 @@ def test_contains_requirable_file_eh_extension
16821682
def test_contains_requirable_file_eh_extension_java_platform
16831683
ext_spec(platform: Gem::Platform.new("java"))
16841684

1685-
_, err = capture_io do
1685+
_, err = capture_output do
16861686
refute @ext.contains_requirable_file? 'nonexistent'
16871687
end
16881688

@@ -3515,7 +3515,7 @@ def test_load_errors_contain_filename
35153515
specfile.write "raise 'boom'"
35163516
specfile.close
35173517
begin
3518-
capture_io do
3518+
capture_output do
35193519
Gem::Specification.load(specfile.path)
35203520
end
35213521
rescue => e

‎test/rubygems/test_gem_stub_specification.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def test_contains_requirable_file_eh
6767
def test_contains_requirable_file_eh_extension
6868
skip "I guess making the stub match the running platform should work" if Gem.java_platform?
6969
stub_with_extension do |stub|
70-
_, err = capture_io do
70+
_, err = capture_output do
7171
refute stub.contains_requirable_file? 'nonexistent'
7272
end
7373

@@ -189,7 +189,7 @@ def test_to_spec_activated
189189
def test_to_spec_missing_extensions
190190
stub = stub_with_extension
191191

192-
capture_io do
192+
capture_output do
193193
stub.contains_requirable_file? 'nonexistent'
194194
end
195195

0 commit comments

Comments
 (0)
0