Skip to content

Commit

Permalink
Preserve options with stylesheet_link_tag :all (#177)
Browse files Browse the repository at this point in the history
Ensure that we don't lose any options passed to `stylesheet_link_tag`
when using the `:all` option. Previously the options were being
discarded.
  • Loading branch information
kevinmcconnell committed Jan 10, 2024
1 parent 40ce740 commit e7cdbcd
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
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

0 comments on commit e7cdbcd

Please sign in to comment.