diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/autoloaders.rb | 12 | ||||
| -rw-r--r-- | railties/test/application/configuration_test.rb | 4 | ||||
| -rw-r--r-- | railties/test/application/rake/dbs_test.rb | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/railties/lib/rails/autoloaders.rb b/railties/lib/rails/autoloaders.rb index a6974cc207..1bd3f18a74 100644 --- a/railties/lib/rails/autoloaders.rb +++ b/railties/lib/rails/autoloaders.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "active_support/dependencies/zeitwerk_integration" + module Rails module Autoloaders # :nodoc: class << self @@ -7,13 +9,19 @@ module Rails def main if zeitwerk_enabled? - @main ||= Zeitwerk::Loader.new.tap { |loader| loader.tag = "rails.main" } + @main ||= Zeitwerk::Loader.new.tap do |loader| + loader.tag = "rails.main" + loader.inflector = ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector + end end end def once if zeitwerk_enabled? - @once ||= Zeitwerk::Loader.new.tap { |loader| loader.tag = "rails.once" } + @once ||= Zeitwerk::Loader.new.tap do |loader| + loader.tag = "rails.once" + loader.inflector = ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector + end end end diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 73773602a3..9ba5517afd 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -1167,6 +1167,8 @@ module ApplicationTests assert_instance_of Zeitwerk::Loader, Rails.autoloaders.once assert_equal "rails.once", Rails.autoloaders.once.tag assert_equal [Rails.autoloaders.main, Rails.autoloaders.once], Rails.autoloaders.to_a + assert_equal ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector, Rails.autoloaders.main.inflector + assert_equal ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector, Rails.autoloaders.once.inflector config.autoloader = :classic assert_not Rails.autoloaders.zeitwerk_enabled? @@ -1181,6 +1183,8 @@ module ApplicationTests assert_instance_of Zeitwerk::Loader, Rails.autoloaders.once assert_equal "rails.once", Rails.autoloaders.once.tag assert_equal [Rails.autoloaders.main, Rails.autoloaders.once], Rails.autoloaders.to_a + assert_equal ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector, Rails.autoloaders.main.inflector + assert_equal ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector, Rails.autoloaders.once.inflector assert_raises(ArgumentError) { config.autoloader = :unknown } end diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb index 07d57dea8a..4f689bcb78 100644 --- a/railties/test/application/rake/dbs_test.rb +++ b/railties/test/application/rake/dbs_test.rb @@ -131,7 +131,7 @@ module ApplicationTests end end - test "db:truncate_all truncates all not internal tables" do + test "db:truncate_all truncates all non-internal tables" do Dir.chdir(app_path) do rails "generate", "model", "book", "title:string" rails "db:migrate" @@ -433,7 +433,7 @@ module ApplicationTests assert_equal "test", test_environment.call end - test "db:seed:replant truncates all not internal tables and loads the seeds" do + test "db:seed:replant truncates all non-internal tables and loads the seeds" do Dir.chdir(app_path) do rails "generate", "model", "book", "title:string" rails "db:migrate" |