Test fixes

djmb · Aug 22, 2024 · 5c67816 · 5c67816
1 parent 488a049
commit 5c67816
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb
@@ -9,7 +9,7 @@
 dummy_app_path     = Dir.mktmpdir + "/dummy"
 dummy_app_template = File.expand_path("dummy_app_template.rb",  __dir__)
 args = Rails::Generators::ARGVScrubber.new(["new", dummy_app_path, "--skip-gemfile", "--skip-bundle",
-  "--skip-git", "-d", "sqlite3", "--skip-javascript", "--force", "--quiet",
+  "--skip-git", "-d", "sqlite3", "--skip-javascript", "--skip-solid-cache", "--force", "--quiet",
   "--template", dummy_app_template]).prepare!
 Rails::Generators::AppGenerator.start args
 

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
@@ -63,6 +63,7 @@
   "db/seeds.rb",
   "lib/tasks/.keep",
   "log/.keep",
+  "log/test.log",
   "public/404.html",
   "public/406-unsupported-browser.html",
   "public/422.html",
@@ -82,6 +83,7 @@
   "test/system/.keep",
   "test/test_helper.rb",
   "tmp/.keep",
+  "tmp/local_secret.txt",
   "tmp/pids/.keep",
   "tmp/storage/.keep",
   "vendor/.keep"

diff --git a/railties/test/generators/db_system_change_generator_test.rb b/railties/test/generators/db_system_change_generator_test.rb
@@ -144,7 +144,7 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
               assert_not_includes content["containerEnv"].keys, "DB_HOST"
             end
 
-            assert_cache_migration_files in: "db/cache/migrate", not_in: "db/migrate"
+            assert_cache_migration_files here: "db/cache/migrate", not_here: "db/migrate"
           end
 
           test "change to trilogy" do
@@ -186,7 +186,7 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
               assert_equal expected_mariadb_config, compose_config["services"]["mariadb"]
               assert_includes compose_config["volumes"].keys, "mariadb-data"
 
-              assert_cache_migration_files in: "db/migrate", not_in: "db/cache/migrate"
+              assert_cache_migration_files here: "db/migrate", not_here: "db/cache/migrate"
             end
           end
 
@@ -224,9 +224,9 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
           end
 
           private
-            def assert_cache_migration_files(in:, not_in)
-              assert_operator Dir.glob("#{in}/*.solid_cache.rb").size, :>, 1
-              assert_equal Dir.glob("#{not_in}/*.solid_cache.rb").size, 0
+            def assert_cache_migration_files(here:, not_here:)
+              assert_operator Dir.glob("#{here}/*.solid_cache.rb").size, :>, 1
+              assert_equal Dir.glob("#{not_here}/*.solid_cache.rb").size, 0
             end
         end
       end