diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-23 15:43:43 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-23 15:43:43 -0500 |
| commit | 26ba863fd90531b9e781d1b118eab548edb66fd6 (patch) | |
| tree | dce7b5a90cb7f55acf26c5a99bfd928ec72b0fa8 /railties/test/application/assets_test.rb | |
| parent | 32cdc032c30dad13931b6ce800d740a72872dabd (diff) | |
| parent | 4f31b7767e4a3cf7125235455a652f263c431278 (diff) | |
| download | rails-26ba863fd90531b9e781d1b118eab548edb66fd6.tar.gz rails-26ba863fd90531b9e781d1b118eab548edb66fd6.tar.bz2 rails-26ba863fd90531b9e781d1b118eab548edb66fd6.zip | |
Merge pull request #14852 from matthewd/fix_build_for_assets
Fix railties asset tests: precompile the image we're referencing
Diffstat (limited to 'railties/test/application/assets_test.rb')
| -rw-r--r-- | railties/test/application/assets_test.rb | 4 |
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) |