From 9f020364660626a27fb709ed62d95a6e82ead8e5 Mon Sep 17 00:00:00 2001 From: Emmanuel Hayford Date: Tue, 30 Sep 2025 07:35:17 +0200 Subject: [PATCH 1/2] Fix system test for scaffolds Fixes #585 --- lib/generators/test_unit/scaffold/scaffold_generator.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/generators/test_unit/scaffold/scaffold_generator.rb b/lib/generators/test_unit/scaffold/scaffold_generator.rb index c9f1647..535b4db 100644 --- a/lib/generators/test_unit/scaffold/scaffold_generator.rb +++ b/lib/generators/test_unit/scaffold/scaffold_generator.rb @@ -4,11 +4,10 @@ module TestUnit # :nodoc: module Generators # :nodoc: class ScaffoldGenerator < Base # :nodoc: def fix_system_test - if turbo_defined? && options[:system_tests] - gsub_file File.join("test/system", class_path, "#{file_name.pluralize}_test.rb"), - /(click_on.*Destroy this.*)$/, - "accept_confirm { \\1 }" - end + return unless turbo_defined? && options[:system_tests] == "true" + test_file = File.join("test/system", class_path, "#{file_name.pluralize}_test.rb") + return unless File.exist?(test_file) + gsub_file test_file, /(click_on.*Destroy this.*)$/, "accept_confirm { \\1 }" end private From 14767db03e4bb7669da15ae51e094af5fadc7215 Mon Sep 17 00:00:00 2001 From: Emmanuel Hayford Date: Tue, 30 Sep 2025 07:49:02 +0200 Subject: [PATCH 2/2] Fix system tests --- lib/generators/test_unit/scaffold/scaffold_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generators/test_unit/scaffold/scaffold_generator.rb b/lib/generators/test_unit/scaffold/scaffold_generator.rb index 535b4db..d55395f 100644 --- a/lib/generators/test_unit/scaffold/scaffold_generator.rb +++ b/lib/generators/test_unit/scaffold/scaffold_generator.rb @@ -4,7 +4,7 @@ module TestUnit # :nodoc: module Generators # :nodoc: class ScaffoldGenerator < Base # :nodoc: def fix_system_test - return unless turbo_defined? && options[:system_tests] == "true" + return unless turbo_defined? && options[:system_tests] test_file = File.join("test/system", class_path, "#{file_name.pluralize}_test.rb") return unless File.exist?(test_file) gsub_file test_file, /(click_on.*Destroy this.*)$/, "accept_confirm { \\1 }"