From 37d5093dc818b41839b03b34db9c2fcbd556fe77 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Sun, 9 Feb 2025 10:59:32 -0500
Subject: [PATCH] test: update the integration install test to use static
 variable

In tailwindcss v4.0.5, tailwindlabs/tailwindcss#16211 is smarter about
not including unused theme variables, but `static` is the documented
way to opt into the older behavior.
---
 test/integration/user_install_test.sh | 5 +++--
 test/integration/user_upgrade_test.sh | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/integration/user_install_test.sh b/test/integration/user_install_test.sh
index 09b03b2f..df3aa8f2 100755
--- a/test/integration/user_install_test.sh
+++ b/test/integration/user_install_test.sh
@@ -7,7 +7,8 @@ set -eux
 
 # set up dependencies
 rm -f Gemfile.lock
-bundle remove actionmailer
+bundle remove actionmailer || true
+bundle remove rails || true
 bundle add rails --skip-install ${RAILSOPTS:-}
 bundle install --prefer-local
 
@@ -47,7 +48,7 @@ end
 EOF
 
 cat >> app/assets/tailwind/application.css <<EOF
-@theme { --color-special: #abc12399; }
+@theme static { --color-special: #abc12399; }
 EOF
 
 bin/rails tailwindcss:build still_here | grep "Rake process did not exit early"
diff --git a/test/integration/user_upgrade_test.sh b/test/integration/user_upgrade_test.sh
index 25039a02..d6017efc 100755
--- a/test/integration/user_upgrade_test.sh
+++ b/test/integration/user_upgrade_test.sh
@@ -7,7 +7,8 @@ set -eux
 
 # set up dependencies
 rm -f Gemfile.lock
-bundle remove actionmailer
+bundle remove actionmailer || true
+bundle remove rails || true
 bundle add rails --skip-install ${RAILSOPTS:-}
 bundle install --prefer-local