Skip to content

Commit 45328e3

Browse files
committed
Update test_helper.rb to improve deprecation handling and unify fixture paths
1 parent 652fdb5 commit 45328e3

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

test/test_helper.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
ENV['DATABASE_URL'] ||= "sqlite3:test_db"
2424

2525
require 'active_record/railtie'
26-
require 'rails/test_help'
2726
require 'minitest/mock'
2827
require 'jsonapi-resources'
2928
require 'pry'
@@ -42,7 +41,11 @@
4241
config.json_key_format = :camelized_key
4342
end
4443

45-
ActiveSupport::Deprecation.silenced = true
44+
if ActiveSupport::Deprecation.respond_to?(:behavior=)
45+
ActiveSupport::Deprecation.behavior = :silence
46+
elsif ActiveSupport::Deprecation.respond_to?(:silenced=)
47+
ActiveSupport::Deprecation.silenced = true
48+
end
4649

4750
puts "Testing With RAILS VERSION #{Rails.version}"
4851

@@ -457,20 +460,20 @@ def run_in_transaction?
457460
true
458461
end
459462

460-
self.fixture_path = "#{Rails.root}/fixtures"
463+
self.fixture_paths = ["#{Rails.root}/fixtures"]
461464
fixtures :all
462465
end
463466

464467
class ActiveSupport::TestCase
465-
self.fixture_path = "#{Rails.root}/fixtures"
468+
self.fixture_paths = ["#{Rails.root}/fixtures"]
466469
fixtures :all
467470
setup do
468471
@routes = TestApp.routes
469472
end
470473
end
471474

472475
class ActionDispatch::IntegrationTest
473-
self.fixture_path = "#{Rails.root}/fixtures"
476+
self.fixture_paths = ["#{Rails.root}/fixtures"]
474477
fixtures :all
475478

476479
def assert_jsonapi_response(expected_status, msg = nil)

0 commit comments

Comments
 (0)