Skip to content

Commit 3955218

Browse files
committed
Remove deprecated #use_transactional_fixtures configuration
1 parent 8029f77 commit 3955218

File tree

3 files changed

+5
-31
lines changed

3 files changed

+5
-31
lines changed

activerecord/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Remove deprecated `#use_transactional_fixtures` configuration.
2+
3+
*Rafael Mendonça França*
4+
15
* Remove deprecated `#raise_in_transactional_callbacks` configuration.
26

37
*Rafael Mendonça França*

activerecord/lib/active_record/fixtures.rb

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -862,29 +862,17 @@ def after_teardown # :nodoc:
862862
class_attribute :fixture_table_names
863863
class_attribute :fixture_class_names
864864
class_attribute :use_transactional_tests
865-
class_attribute :use_transactional_fixtures
866865
class_attribute :use_instantiated_fixtures # true, false, or :no_instances
867866
class_attribute :pre_loaded_fixtures
868867
class_attribute :config
869868

870-
singleton_class.deprecate "use_transactional_fixtures=" => "use use_transactional_tests= instead"
871-
872869
self.fixture_table_names = []
873870
self.use_instantiated_fixtures = false
874871
self.pre_loaded_fixtures = false
875872
self.config = ActiveRecord::Base
876873

877874
self.fixture_class_names = {}
878-
879-
silence_warnings do
880-
define_singleton_method :use_transactional_tests do
881-
if use_transactional_fixtures.nil?
882-
true
883-
else
884-
use_transactional_fixtures
885-
end
886-
end
887-
end
875+
self.use_transactional_tests = true
888876
end
889877

890878
module ClassMethods

activerecord/test/cases/test_fixtures_test.rb

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,7 @@ class TestFixturesTest < ActiveRecord::TestCase
66
@klass.include(ActiveRecord::TestFixtures)
77
end
88

9-
def test_deprecated_use_transactional_fixtures=
10-
assert_deprecated "use use_transactional_tests= instead" do
11-
@klass.use_transactional_fixtures = true
12-
end
13-
end
14-
15-
def test_use_transactional_tests_prefers_use_transactional_fixtures
16-
ActiveSupport::Deprecation.silence do
17-
@klass.use_transactional_fixtures = false
18-
end
19-
20-
assert_equal false, @klass.use_transactional_tests
21-
end
22-
239
def test_use_transactional_tests_defaults_to_true
24-
ActiveSupport::Deprecation.silence do
25-
@klass.use_transactional_fixtures = nil
26-
end
27-
2810
assert_equal true, @klass.use_transactional_tests
2911
end
3012

0 commit comments

Comments
 (0)