Skip to content
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.

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

Preserve options with stylesheet_link_tag :all #177

Merged
merged 1 commit into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/propshaft/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ def compute_asset_path(path, options = {})
end

# Add an option to call `stylesheet_link_tag` with `:all` to include every css file found on the load path.
def stylesheet_link_tag(*sources)
def stylesheet_link_tag(*sources, **options)
if sources.first == :all
super *all_stylesheets_paths
super *all_stylesheets_paths, **options
else
super
end
Expand Down
2 changes: 1 addition & 1 deletion test/dummy/app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<%= csrf_meta_tags %>
<%= csp_meta_tag %>

<%= stylesheet_link_tag :all %>
<%= stylesheet_link_tag :all, data: { custom_attribute: true } %>
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions test/propshaft_integration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ class PropshaftIntegrationTest < ActionDispatch::IntegrationTest

assert_response :success

assert_select 'link[href="/assets/hello_world-4137140a.css"]'
assert_select 'link[href="/assets/goodbye-b1dc9940.css"]'
assert_select 'link[href="/assets/hello_world-4137140a.css"][data-custom-attribute="true"]'
assert_select 'link[href="/assets/goodbye-b1dc9940.css"][data-custom-attribute="true"]'

assert_select 'script[src="/assets/hello_world-888761f8.js"]'
end
Expand Down