Skip to content

Commit fcdb58f

Browse files
committed
Remove AS::Testing::Stream in favor of Minitest assert_output
1 parent e353906 commit fcdb58f

File tree

6 files changed

+11
-68
lines changed

6 files changed

+11
-68
lines changed

.rubocop_todo.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ Style/TrailingBlankLines:
222222
- 'test/adapter/null_test.rb'
223223
- 'test/serializers/cache_test.rb'
224224
- 'test/serializers/fieldset_test.rb'
225-
- 'test/support/stream_capture.rb'
226225

227226
# Offense count: 5
228227
# Cop supports --auto-correct.

test/action_controller/serialization_test.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
module ActionController
44
module Serialization
55
class ImplicitSerializerTest < ActionController::TestCase
6-
include ActiveSupport::Testing::Stream
76
class ImplicitSerializationTestController < ActionController::Base
87
include SerializationTesting
98
def render_using_implicit_serializer
@@ -438,9 +437,9 @@ def use_adapter?
438437
false
439438
end
440439
end.new
441-
assert_match(/adapter: false/, (capture(:stderr) do
440+
assert_output(nil, /adapter: false/) do
442441
controller.get_serializer(Profile.new)
443-
end))
442+
end
444443
end
445444

446445
def test_dont_warn_overridding_use_adapter_as_truthy_on_controller_instance
@@ -449,9 +448,9 @@ def use_adapter?
449448
true
450449
end
451450
end.new
452-
assert_equal '', (capture(:stderr) do
451+
assert_output(nil, '') do
453452
controller.get_serializer(Profile.new)
454-
end)
453+
end
455454
end
456455

457456
def test_render_event_is_emmited

test/array_serializer_test.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ class Serializer
66
# Minitest.run_one_method isn't present in minitest 4
77
if $minitest_version > 4 # rubocop:disable Style/GlobalVars
88
class ArraySerializerTest < CollectionSerializerTest
9-
extend ActiveSupport::Testing::Stream
9+
extend Minitest::Assertions
1010
def self.run_one_method(*)
11-
stderr = (capture(:stderr) do
11+
_, stderr = capture_io do
1212
super
13-
end)
13+
end
1414
if stderr !~ /Calling deprecated ArraySerializer/
1515
fail Minitest::Assertion, stderr
1616
end
@@ -22,14 +22,13 @@ def collection_serializer
2222
end
2323
else
2424
class ArraySerializerTest < ActiveSupport::TestCase
25-
extend ActiveSupport::Testing::Stream
2625
def test_json_key_with_root_warns_when_using_array_serializer
27-
stderr = (capture(:stderr) do
26+
_, stderr = capture_io do
2827
comment = Comment.new
2928
post = Post.new
3029
serializer = ArraySerializer.new([comment, post])
3130
assert_equal 'comments', serializer.json_key
32-
end)
31+
end
3332
assert_match(/Calling deprecated ArraySerializer/, stderr)
3433
end
3534
end

test/serializers/cache_test.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
require 'tempfile'
44
module ActiveModelSerializers
55
class CacheTest < ActiveSupport::TestCase
6-
include ActiveSupport::Testing::Stream
7-
86
def setup
97
ActionController::Base.cache_store.clear
108
@comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
@@ -222,10 +220,10 @@ def test_digest_caller_file
222220
def test_warn_on_serializer_not_defined_in_file
223221
called = false
224222
serializer = Class.new(ActiveModel::Serializer)
225-
assert_match(/_cache_digest/, (capture(:stderr) do
223+
assert_output(nil, /_cache_digest/) do
226224
serializer.digest_caller_file('')
227225
called = true
228-
end))
226+
end
229227
assert called
230228
end
231229

test/support/stream_capture.rb

Lines changed: 0 additions & 50 deletions
This file was deleted.

test/test_helper.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
require 'minitest/reporters'
4444
Minitest::Reporters.use!
4545

46-
require 'support/stream_capture'
47-
4846
require 'support/rails_app'
4947

5048
require 'support/test_case'

0 commit comments

Comments
 (0)