Merge branch 'main' into feature/engines-convention-over-configuration-support

Author: bopm

CHANGELOG.md

@@ -1,5 +1,13 @@
 # `tailwindcss-rails` Changelog
 
+## v4.2.1 / 2025-03-19
+
+### Fixed
+
+* Fix styles for form errors in some scaffold fields. #513 @patriciomacadden
+* Update scaffold system tests to handle the "Destroy" confirmation prompt when Turbo is enabled. Fixes #519. #520 @patriciomacadden @flavorjones
+
+
 ## v4.2.0 / 2025-03-02
 
 ### Features

lib/generators/tailwindcss/scaffold/scaffold_generator.rb

@@ -1,5 +1,6 @@
 require "rails/generators/erb/scaffold/scaffold_generator"
 require "rails/generators/resource_helpers"
+require File.expand_path("../../test_unit/scaffold/scaffold_generator.rb", __dir__)
 
 module Tailwindcss
   module Generators

lib/generators/tailwindcss/scaffold/templates/_form.html.erb.tt

@@ -23,7 +23,7 @@
     <%%= form.password_field :password_confirmation, class: ["block shadow-sm rounded-md border px-3 py-2 mt-2 w-full", {"border-gray-400 focus:outline-blue-600": <%= model_resource_name %>.errors[:password_confirmation].none?, "border-red-400 focus:outline-red-600": <%= model_resource_name %>.errors[:password_confirmation].any?}] %>
 <% elsif attribute.attachments? -%>
     <%%= form.label :<%= attribute.column_name %> %>
-    <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true, class: ["block shadow-sm rounded-md border px-3 py-2 mt-2 w-full", {"border-gray-400 focus:outline-blue-600": <%= model_resource_name %>.errors[:password].none?, "border-red-400 focus:outline-red-600": <%= model_resource_name %>.errors[:password].any?}] %>
+    <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true, class: ["block shadow-sm rounded-md border px-3 py-2 mt-2 w-full", {"border-gray-400 focus:outline-blue-600": <%= model_resource_name %>.errors[:<%= attribute.column_name %>].none?, "border-red-400 focus:outline-red-600": <%= model_resource_name %>.errors[:<%= attribute.column_name %>].any?}] %>
 <% else -%>
     <%%= form.label :<%= attribute.column_name %> %>
 <% if attribute.field_type == :textarea || attribute.field_type == :text_area -%>

lib/generators/test_unit/scaffold/scaffold_generator.rb

@@ -0,0 +1,21 @@
+require "rails/generators/test_unit/scaffold/scaffold_generator"
+
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class ScaffoldGenerator < Base # :nodoc:
+      def fix_system_test
+        if turbo_defined?
+          gsub_file File.join("test/system", class_path, "#{file_name.pluralize}_test.rb"),
+                    /(click_on.*Destroy this.*)$/,
+                    "accept_confirm { \\1 }"
+        end
+      end
+
+      private
+
+      def turbo_defined?
+        defined?(Turbo)
+      end
+    end
+  end
+end

lib/tailwindcss/version.rb

@@ -1,3 +1,3 @@
 module Tailwindcss
-  VERSION = "4.2.0"
+  VERSION = "4.2.1"
 end

test/integration/user_install_test.sh

@@ -63,6 +63,9 @@ fi
 bin/rails generate scaffold post title:string body:text published:boolean
 grep -q "Show" app/views/posts/index.html.erb
 
+# TEST: the "accept_confirm" system test change was applied cleanly
+grep -q "accept_confirm { click_on \"Destroy this post\"" test/system/posts_test.rb
+
 # TEST: contents of the css file
 bin/rails tailwindcss:build[verbose]
 grep -q "py-2" app/assets/builds/tailwind.css