4 files changed, 51 insertions, 3 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index a7dd233f3d..651897d8f3 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -311,7 +311,7 @@ module ApplicationTests
 
       manifest = Dir["#{app_path}/public/assets/.sprockets-manifest-*.json"].first
       assets = ActiveSupport::JSON.decode(File.read(manifest))
-      assert asset_path = assets["assets"].find { |(k, _)| k && k =~ /.png/ }[1]
+      assert asset_path = assets["assets"].find { |(k, _)| /.png/.match?(k) }[1]
 
       # Load app env
       app "development"
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 38dda20bec..b44edbc7d3 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -456,7 +456,7 @@ module ApplicationTests
     test "filter_parameters should be able to set via config.filter_parameters" do
       add_to_config <<-RUBY
         config.filter_parameters += [ :foo, 'bar', lambda { |key, value|
-          value = value.reverse if key =~ /baz/
+          value = value.reverse if /baz/.match?(key)
         }]
       RUBY
 
@@ -790,7 +790,7 @@ module ApplicationTests
       end
 
       get "/"
-      assert last_response.body =~ /csrf\-param/
+      assert_match(/csrf\-param/, last_response.body)
     end
 
     test "default form builder specified as a string" do
diff --git a/railties/test/application/rake/multi_dbs_test.rb b/railties/test/application/rake/multi_dbs_test.rb
index 2606e64424..c5f8904f4e 100644
--- a/railties/test/application/rake/multi_dbs_test.rb
+++ b/railties/test/application/rake/multi_dbs_test.rb
@@ -349,6 +349,25 @@ module ApplicationTests
           rails "db:drop" rescue nil
         end
       end
+
+      test "db:seed uses primary database connection" do
+        @old_rails_env = ENV["RAILS_ENV"]
+        @old_rack_env = ENV["RACK_ENV"]
+        ENV.delete "RAILS_ENV"
+        ENV.delete "RACK_ENV"
+
+        db_migrate_and_schema_dump_and_load "schema"
+
+        app_file "db/seeds.rb", <<-RUBY
+          print Book.connection.pool.spec.config[:database]
+        RUBY
+
+        output = rails("db:seed")
+        assert_equal output, "db/development.sqlite3"
+      ensure
+        ENV["RAILS_ENV"] = @old_rails_env
+        ENV["RACK_ENV"] = @old_rack_env
+      end
     end
   end
 end
diff --git a/railties/test/application/zeitwerk_integration_test.rb b/railties/test/application/zeitwerk_integration_test.rb
index ff8c06b479..d03fa3d0c6 100644
--- a/railties/test/application/zeitwerk_integration_test.rb
+++ b/railties/test/application/zeitwerk_integration_test.rb
@@ -150,6 +150,35 @@ class ZeitwerkIntegrationTest < ActiveSupport::TestCase
     assert_empty deps.autoloaded_constants
   end
 
+  [true, false].each do |add_aps_to_lp|
+    test "require_dependency looks autoload paths up (#{add_aps_to_lp})" do
+      add_to_config "config.add_autoload_paths_to_load_path = #{add_aps_to_lp}"
+      app_file "app/models/user.rb", "class User; end"
+      boot
+
+      assert require_dependency("user")
+    end
+
+    test "require_dependency handles absolute paths correctly (#{add_aps_to_lp})" do
+      add_to_config "config.add_autoload_paths_to_load_path = #{add_aps_to_lp}"
+      app_file "app/models/user.rb", "class User; end"
+      boot
+
+      assert require_dependency("#{app_path}/app/models/user.rb")
+    end
+
+    test "require_dependency supports arguments that repond to to_path (#{add_aps_to_lp})" do
+      add_to_config "config.add_autoload_paths_to_load_path = #{add_aps_to_lp}"
+      app_file "app/models/user.rb", "class User; end"
+      boot
+
+      user = Object.new
+      def user.to_path; "user"; end
+
+      assert require_dependency(user)
+    end
+  end
+
   test "eager loading loads the application code" do
     $zeitwerk_integration_test_user = false
     $zeitwerk_integration_test_post = false