File tree Expand file tree Collapse file tree 6 files changed +11
-68
lines changed Expand file tree Collapse file tree 6 files changed +11
-68
lines changed Original file line number Diff line number Diff line change @@ -222,7 +222,6 @@ Style/TrailingBlankLines:
222
222
- ' test/adapter/null_test.rb'
223
223
- ' test/serializers/cache_test.rb'
224
224
- ' test/serializers/fieldset_test.rb'
225
- - ' test/support/stream_capture.rb'
226
225
227
226
# Offense count: 5
228
227
# Cop supports --auto-correct.
Original file line number Diff line number Diff line change 3
3
module ActionController
4
4
module Serialization
5
5
class ImplicitSerializerTest < ActionController ::TestCase
6
- include ActiveSupport ::Testing ::Stream
7
6
class ImplicitSerializationTestController < ActionController ::Base
8
7
include SerializationTesting
9
8
def render_using_implicit_serializer
@@ -438,9 +437,9 @@ def use_adapter?
438
437
false
439
438
end
440
439
end . new
441
- assert_match ( /adapter: false/ , ( capture ( :stderr ) do
440
+ assert_output ( nil , /adapter: false/ ) do
442
441
controller . get_serializer ( Profile . new )
443
- end ) )
442
+ end
444
443
end
445
444
446
445
def test_dont_warn_overridding_use_adapter_as_truthy_on_controller_instance
@@ -449,9 +448,9 @@ def use_adapter?
449
448
true
450
449
end
451
450
end . new
452
- assert_equal '' , ( capture ( :stderr ) do
451
+ assert_output ( nil , '' ) do
453
452
controller . get_serializer ( Profile . new )
454
- end )
453
+ end
455
454
end
456
455
457
456
def test_render_event_is_emmited
Original file line number Diff line number Diff line change @@ -6,11 +6,11 @@ class Serializer
6
6
# Minitest.run_one_method isn't present in minitest 4
7
7
if $minitest_version > 4 # rubocop:disable Style/GlobalVars
8
8
class ArraySerializerTest < CollectionSerializerTest
9
- extend ActiveSupport :: Testing :: Stream
9
+ extend Minitest :: Assertions
10
10
def self . run_one_method ( *)
11
- stderr = ( capture ( :stderr ) do
11
+ _ , stderr = capture_io do
12
12
super
13
- end )
13
+ end
14
14
if stderr !~ /Calling deprecated ArraySerializer/
15
15
fail Minitest ::Assertion , stderr
16
16
end
@@ -22,14 +22,13 @@ def collection_serializer
22
22
end
23
23
else
24
24
class ArraySerializerTest < ActiveSupport ::TestCase
25
- extend ActiveSupport ::Testing ::Stream
26
25
def test_json_key_with_root_warns_when_using_array_serializer
27
- stderr = ( capture ( :stderr ) do
26
+ _ , stderr = capture_io do
28
27
comment = Comment . new
29
28
post = Post . new
30
29
serializer = ArraySerializer . new ( [ comment , post ] )
31
30
assert_equal 'comments' , serializer . json_key
32
- end )
31
+ end
33
32
assert_match ( /Calling deprecated ArraySerializer/ , stderr )
34
33
end
35
34
end
Original file line number Diff line number Diff line change 3
3
require 'tempfile'
4
4
module ActiveModelSerializers
5
5
class CacheTest < ActiveSupport ::TestCase
6
- include ActiveSupport ::Testing ::Stream
7
-
8
6
def setup
9
7
ActionController ::Base . cache_store . clear
10
8
@comment = Comment . new ( id : 1 , body : 'ZOMG A COMMENT' )
@@ -222,10 +220,10 @@ def test_digest_caller_file
222
220
def test_warn_on_serializer_not_defined_in_file
223
221
called = false
224
222
serializer = Class . new ( ActiveModel ::Serializer )
225
- assert_match ( /_cache_digest/ , ( capture ( :stderr ) do
223
+ assert_output ( nil , /_cache_digest/ ) do
226
224
serializer . digest_caller_file ( '' )
227
225
called = true
228
- end ) )
226
+ end
229
227
assert called
230
228
end
231
229
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 43
43
require 'minitest/reporters'
44
44
Minitest ::Reporters . use!
45
45
46
- require 'support/stream_capture'
47
-
48
46
require 'support/rails_app'
49
47
50
48
require 'support/test_case'
You can’t perform that action at this time.
0 commit comments