File tree Expand file tree Collapse file tree 1 file changed +12
-6
lines changed
activerecord/lib/active_record Expand file tree Collapse file tree 1 file changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -708,11 +708,18 @@ module ActiveRecord
708
708
module TestFixtures
709
709
extend ActiveSupport ::Concern
710
710
711
- included do
712
- setup :setup_fixtures
713
- teardown :teardown_fixtures
711
+ def before_setup
712
+ setup_fixtures
713
+ super
714
+ end
715
+
716
+ def after_teardown
717
+ super
718
+ teardown_fixtures
719
+ end
714
720
715
- class_attribute :fixture_path
721
+ included do
722
+ class_attribute :fixture_path , :instance_writer => false
716
723
class_attribute :fixture_table_names
717
724
class_attribute :fixture_class_names
718
725
class_attribute :use_transactional_fixtures
@@ -765,8 +772,7 @@ def fixtures(*fixture_set_names)
765
772
def try_to_load_dependency ( file_name )
766
773
require_dependency file_name
767
774
rescue LoadError => e
768
- # Let's hope the developer has included it himself
769
-
775
+ # Let's hope the developer has included it
770
776
# Let's warn in case this is a subdependency, otherwise
771
777
# subdependency error messages are totally cryptic
772
778
if ActiveRecord ::Base . logger
You can’t perform that action at this time.
0 commit comments