aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2014-04-24 04:44:20 +0930
committerMatthew Draper <matthew@trebex.net>2014-04-24 04:49:02 +0930
commit4f31b7767e4a3cf7125235455a652f263c431278 (patch)
treedce7b5a90cb7f55acf26c5a99bfd928ec72b0fa8 /railties/test/application
parent32cdc032c30dad13931b6ce800d740a72872dabd (diff)
downloadrails-4f31b7767e4a3cf7125235455a652f263c431278.tar.gz
rails-4f31b7767e4a3cf7125235455a652f263c431278.tar.bz2
rails-4f31b7767e4a3cf7125235455a652f263c431278.zip
Precompile the image we're referencing, too.
You can't compile a file that references a non-compiled asset's path. .. unless you turn off asset runtime errors. Outside of a test case like this, `config.assets.precompile` would normally retain its default entry, which precompiles all images (and other non-JS/CSS files) that are in `app/assets`.
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/assets_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 51f55a560f..410b0f7d70 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -450,7 +450,7 @@ module ApplicationTests
test "asset urls should be protocol-relative if no request is in scope" do
app_file "app/assets/images/rails.png", "notreallyapng"
app_file "app/assets/javascripts/image_loader.js.erb", "var src='<%= image_path('rails.png') %>';"
- add_to_config "config.assets.precompile = %w{image_loader.js}"
+ add_to_config "config.assets.precompile = %w{rails.png image_loader.js}"
add_to_config "config.asset_host = 'example.com'"
precompile!
@@ -462,7 +462,7 @@ module ApplicationTests
app_file "app/assets/images/rails.png", "notreallyapng"
app_file "app/assets/javascripts/app.js.erb", "var src='<%= image_path('rails.png') %>';"
- add_to_config "config.assets.precompile = %w{app.js}"
+ add_to_config "config.assets.precompile = %w{rails.png app.js}"
precompile!
assert_match "src='/sub/uri/assets/rails.png'", File.read(Dir["#{app_path}/public/assets/app-*.js"].first)