From 6a5401ac7b5c2a4b628b4b08ea0b030079391992 Mon Sep 17 00:00:00 2001
From: Ricky Chilcott <ricky@missionmet.com>
Date: Fri, 19 Jul 2024 12:36:26 -0400
Subject: [PATCH] THREDDED_TESTAPP_SPROCKETS_JS was only used for Rails 6.0

---
 .github/workflows/build.yml      | 4 +---
 spec/dummy/config/application.rb | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e933a95c3..4cd71420e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -113,9 +113,7 @@ jobs:
 
     - name: Install Node Packages via Yarn
       run: |
-        if [[ -z $THREDDED_TESTAPP_SPROCKETS_JS ]]; then
-          cd spec/dummy && yarn && cd -
-        fi
+        cd spec/dummy && yarn && cd -
 
     - name: "Run Tests: test:nojs"
       run: |
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
index d7e8630bb..e9722bb41 100644
--- a/spec/dummy/config/application.rb
+++ b/spec/dummy/config/application.rb
@@ -27,7 +27,7 @@
 
 require 'web-console' if Rails.env.development?
 
-require 'webpacker' if Rails::VERSION::MAJOR >= 6 && ENV['THREDDED_TESTAPP_SPROCKETS_JS'] != '1'
+require 'webpacker' if Rails::VERSION::MAJOR >= 6
 
 module Dummy
   class Application < Rails::Application
@@ -80,7 +80,7 @@ class Application < Rails::Application
     config.load_defaults("#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}") if config.respond_to?(:load_defaults)
 
     def self.thredded_testapp_webpack?
-      Rails::VERSION::MAJOR >= 6 && ENV['THREDDED_TESTAPP_SPROCKETS_JS'] != '1'
+      Rails::VERSION::MAJOR >= 6
     end
   end
 end