@@ -435,65 +435,62 @@ def create_response(opts = {})
435
435
end
436
436
end
437
437
438
- if 5 < Rails ::VERSION ::MAJOR ||
439
- ( Rails ::VERSION ::MAJOR == 5 && 2 <= Rails ::VERSION ::MINOR )
440
- shared_examples_for "does not use deprecated methods for Rails 5.2+" do
441
- it "does not use deprecated method for Rails >= 5.2" do
442
- previous_stderr = $stderr
443
- begin
444
- splitter = RSpec ::Support ::StdErrSplitter . new ( previous_stderr )
445
- $stderr = splitter
446
- response = ::ActionDispatch ::Response . new ( code ) . tap { |x |
447
- x . request = ActionDispatch ::Request . new ( { } )
448
- }
449
- expect ( matcher . matches? ( response ) ) . to be ( true )
450
- expect ( splitter . has_output? ) . to be false
451
- ensure
452
- $stderr = previous_stderr
453
- end
438
+ shared_examples_for "does not use deprecated methods for Rails 5.2+" do
439
+ it "does not use deprecated method for Rails >= 5.2" do
440
+ previous_stderr = $stderr
441
+ begin
442
+ splitter = RSpec ::Support ::StdErrSplitter . new ( previous_stderr )
443
+ $stderr = splitter
444
+ response = ::ActionDispatch ::Response . new ( code ) . tap { |x |
445
+ x . request = ActionDispatch ::Request . new ( { } )
446
+ }
447
+ expect ( matcher . matches? ( response ) ) . to be ( true )
448
+ expect ( splitter . has_output? ) . to be false
449
+ ensure
450
+ $stderr = previous_stderr
454
451
end
455
452
end
453
+ end
456
454
457
- context 'http status :missing' do
458
- it_behaves_like "does not use deprecated methods for Rails 5.2+" do
459
- subject ( :matcher ) { have_http_status ( :missing ) }
460
- let ( :code ) { 404 }
461
- end
455
+ context 'http status :missing' do
456
+ it_behaves_like "does not use deprecated methods for Rails 5.2+" do
457
+ subject ( :matcher ) { have_http_status ( :missing ) }
458
+ let ( :code ) { 404 }
462
459
end
460
+ end
463
461
464
- context 'http status :success' do
465
- it_behaves_like "does not use deprecated methods for Rails 5.2+" do
466
- subject ( :matcher ) { have_http_status ( :success ) }
467
- let ( :code ) { 222 }
468
- end
462
+ context 'http status :success' do
463
+ it_behaves_like "does not use deprecated methods for Rails 5.2+" do
464
+ subject ( :matcher ) { have_http_status ( :success ) }
465
+ let ( :code ) { 222 }
469
466
end
467
+ end
470
468
471
- context 'http status :error' do
472
- it_behaves_like "does not use deprecated methods for Rails 5.2+" do
473
- subject ( :matcher ) { have_http_status ( :error ) }
474
- let ( :code ) { 555 }
475
- end
469
+ context 'http status :error' do
470
+ it_behaves_like "does not use deprecated methods for Rails 5.2+" do
471
+ subject ( :matcher ) { have_http_status ( :error ) }
472
+ let ( :code ) { 555 }
476
473
end
474
+ end
477
475
478
- context 'http status :not_found' do
479
- it_behaves_like "supports different response instances" do
480
- subject ( :matcher ) { have_http_status ( :not_found ) }
481
- let ( :code ) { 404 }
482
- end
476
+ context 'http status :not_found' do
477
+ it_behaves_like "supports different response instances" do
478
+ subject ( :matcher ) { have_http_status ( :not_found ) }
479
+ let ( :code ) { 404 }
483
480
end
481
+ end
484
482
485
- context 'http status :successful' do
486
- it_behaves_like "supports different response instances" do
487
- subject ( :matcher ) { have_http_status ( :successful ) }
488
- let ( :code ) { 222 }
489
- end
483
+ context 'http status :successful' do
484
+ it_behaves_like "supports different response instances" do
485
+ subject ( :matcher ) { have_http_status ( :successful ) }
486
+ let ( :code ) { 222 }
490
487
end
488
+ end
491
489
492
- context 'http status :server_error' do
493
- it_behaves_like "supports different response instances" do
494
- subject ( :matcher ) { have_http_status ( :server_error ) }
495
- let ( :code ) { 555 }
496
- end
490
+ context 'http status :server_error' do
491
+ it_behaves_like "supports different response instances" do
492
+ subject ( :matcher ) { have_http_status ( :server_error ) }
493
+ let ( :code ) { 555 }
497
494
end
498
495
end
499
496
end
0 commit comments