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.

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

Jump to bottom

Give precedence to config.digest = false over the existence of manifest.yml asset digests #3135

Merged
merged 1 commit into from Sep 26, 2011
Merged

Give precedence to config.digest = false over the existence of manifest.yml asset digests #3135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion actionpack/lib/sprockets/helpers/rails_helper.rb
View file
Open in desktop
Expand Up @@ -114,7 +114,7 @@ def asset_for(source, ext)
end

def digest_for(logical_path)
if asset_digests && (digest = asset_digests[logical_path])
if digest_assets && asset_digests && (digest = asset_digests[logical_path])
return digest
end

Expand Down
8 changes: 8 additions & 0 deletions actionpack/test/template/sprockets_helper_test.rb
View file
Open in desktop
Expand Up @@ -262,4 +262,12 @@ def url_for(*args)

assert_not_equal prod_path, dev_path
end

test "precedence of `config.digest = false` over manifest.yml asset digests" do
Rails.application.config.assets.digests = {'logo.png' => 'logo-d1g3st.png'}
@config.assets.digest = false

assert_match %r{/assets/logo.png},
asset_path("logo.png")
end
end