Merge pull request #3135 from christos/respect_assets_digest_value

Give precedence to `config.digest = false` over the existence of manifest.yml asset digests
bobbytables · Sep 26, 2011 · 2c3a507 · 2c3a507
2 parents 3b87c38 + 793e9da
commit 2c3a507
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -118,7 +118,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
 

diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
@@ -266,4 +266,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