Merge pull request #59 from khiav223577/refactor/autoload

Refactor: use gem to setup autoload paths in tests
khiav223577 · Jan 21, 2022 · 2a87d15 · 2a87d15
2 parents 73ca9d6 + 42ea61b
commit 2a87d15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/pluck_all.gemspec b/pluck_all.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   }
 
   spec.add_dependency 'activesupport', '>= 3.0.0'
-  spec.add_dependency 'rails_compatibility', '>= 0.0.7'
+  spec.add_dependency 'rails_compatibility', '>= 0.0.8'
 
   spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
   spec.add_development_dependency 'rake', '~> 12.0'

diff --git a/test/active_record/support/seeds.rb b/test/active_record/support/seeds.rb
@@ -1,13 +1,7 @@
 # frozen_string_literal: true
 
-ActiveSupport::Dependencies.autoload_paths << File.expand_path('../models/', __FILE__)
-
-if ActiveSupport::VERSION::MAJOR >= 7
-  require 'zeitwerk'
-  loader = Zeitwerk::Loader.for_gem
-  ActiveSupport::Dependencies.autoload_paths.each{|path| loader.push_dir(path) }
-  loader.setup
-end
+require 'rails_compatibility/setup_autoload_paths'
+RailsCompatibility.setup_autoload_paths [File.expand_path('../models/', __FILE__)]
 
 ActiveRecord::Schema.define do
   self.verbose = false