From 2dd078d3857d009cddbe0959e72cf9c0c7cfae57 Mon Sep 17 00:00:00 2001 From: Jared Norman Date: Mon, 13 Jul 2026 15:30:19 -0700 Subject: [PATCH 1/3] Fix storefront template URL parser after rename The rename commit updated the error message and clone paths in storefront/template.rb but missed the URL-parsing regex, which still required the path to end in starter_frontend/template.rb. The installer now generates URLs ending in storefront/template.rb, so every remote install would abort with the 'Could not parse' error. CI never caught this because it applies the template from a local path via SOLIDUS_STOREFRONT_TEMPLATE, which skips the URL parser entirely. --- storefront/template.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storefront/template.rb b/storefront/template.rb index 13fe39d4c7..c8a21c4128 100644 --- a/storefront/template.rb +++ b/storefront/template.rb @@ -37,7 +37,7 @@ if __FILE__.match?(%r{\Ahttps?://}) require "uri" url_path = URI.parse(__FILE__).path - match = url_path.match(%r{\A/([^/]+)/([^/]+)/raw/(.+?)/starter_frontend/template\.rb\z}) + match = url_path.match(%r{\A/([^/]+)/([^/]+)/raw/(.+?)/storefront/template\.rb\z}) unless match say_status :error, shell.set_color( "Could not parse storefront template URL: #{__FILE__}\n" \ From 37f641eae32fc5e3e6bb6c65a830f9cfd6421921 Mon Sep 17 00:00:00 2001 From: Jared Norman Date: Mon, 13 Jul 2026 15:38:14 -0700 Subject: [PATCH 2/3] Remove dead code from storefront coverage setup In CI the generated app lives under $RUNNER_TEMP while the repo checkout lives under $GITHUB_WORKSPACE, so the ResultAdapter remap target (SimpleCov.root/../storefront/templates) never exists and the remap never fired. Coverage is still attributed to storefront/templates/** on Codecov because the cobertura report contains app-relative paths (app/controllers/...) that Codecov's path fixing suffix-matches against the repo tree. Verified against the report Codecov ingested for 1f9866783ce6. The ERB trailing-line trimming was equally dead: this port of the coverage setup dropped enable_coverage_for_eval, so no .erb files appear in the results at all. --- storefront/lib/testing_support/coverage.rb | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/storefront/lib/testing_support/coverage.rb b/storefront/lib/testing_support/coverage.rb index 6e64944f3a..dceb154e57 100644 --- a/storefront/lib/testing_support/coverage.rb +++ b/storefront/lib/testing_support/coverage.rb @@ -12,23 +12,6 @@ SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter end - def (SimpleCov::ResultAdapter).call(result) - result = result.transform_keys do |path| - template_path = path.sub( - "#{SimpleCov.root}/", - "#{SimpleCov.root}/../storefront/templates/" - ) - File.exist?(template_path) ? template_path : path - end - result.each do |path, coverage| - next unless path.end_with?(".erb") - - # Remove the extra trailing lines added by ERB - coverage[:lines] = coverage[:lines][...File.read(path).lines.size] - end - result - end - SimpleCov.command_name("solidus:storefront") SimpleCov.merge_timeout(3600) SimpleCov.start("rails") From 949ba9bdfe726769b68bdad1429819228bf74da9 Mon Sep 17 00:00:00 2001 From: Jared Norman Date: Mon, 13 Jul 2026 15:44:31 -0700 Subject: [PATCH 3/3] Rename Docker dev user missed in storefront rename Everything else in .dockerdev derives paths from $APP_USER, so this was the only leftover. --- storefront/.dockerdev/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storefront/.dockerdev/Dockerfile b/storefront/.dockerdev/Dockerfile index 14855d7599..32b0b2e410 100644 --- a/storefront/.dockerdev/Dockerfile +++ b/storefront/.dockerdev/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get -yq dist-upgrad nodejs \ && rm -rf /var/lib/apt/lists/* -ENV APP_USER=solidus_starter_frontend_user \ +ENV APP_USER=solidus_storefront_user \ LANG=C.UTF-8 \ BUNDLE_JOBS=4 \ BUNDLE_RETRY=3