Skip to content

Fixes for storefront merge #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jarednorman merged 3 commits into from
Jul 13, 2026
Merged

Fixes for storefront merge #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dd078d
Fix storefront template URL parser after rename
jarednorman Jul 13, 2026
37f641e
Remove dead code from storefront coverage setup
jarednorman Jul 13, 2026
949ba9b
Rename Docker dev user missed in storefront rename
jarednorman Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion storefront/.dockerdev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 0 additions & 17 deletions storefront/lib/testing_support/coverage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion storefront/template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
Loading