aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/sprockets_helper_test.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-26 08:16:02 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-26 08:16:02 -0700
commit2c3a5075b683f079b6b53f121137d3c38e47a8ef (patch)
tree0d586f5a98fdd3810af19f5295e008a04802a96d /actionpack/test/template/sprockets_helper_test.rb
parent3b87c38d029c1626161a3e7699d40da3e789d7cb (diff)
parent793e9da63d74a082281d41c2bc90e7bd02adcde4 (diff)
downloadrails-2c3a5075b683f079b6b53f121137d3c38e47a8ef.tar.gz
rails-2c3a5075b683f079b6b53f121137d3c38e47a8ef.tar.bz2
rails-2c3a5075b683f079b6b53f121137d3c38e47a8ef.zip
Merge pull request #3135 from christos/respect_assets_digest_value
Give precedence to `config.digest = false` over the existence of manifest.yml asset digests
Diffstat (limited to 'actionpack/test/template/sprockets_helper_test.rb')
-rw-r--r--actionpack/test/template/sprockets_helper_test.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index cac6adaaa4..55c5bcf1b1 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -266,4 +266,12 @@ class SprocketsHelperTest < ActionView::TestCase
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