diff options
author | Tobias Schlottke <tobias.schlottke@gmail.com> | 2011-07-01 09:53:48 +0200 |
---|---|---|
committer | Tobias Schlottke <tobias.schlottke@gmail.com> | 2011-07-01 09:53:48 +0200 |
commit | 139971d3cc06168a69617a61058240afe227af99 (patch) | |
tree | b8dc04aeaa101208744640858f22d66079eb6eee /railties/test | |
parent | cb99c8593a8d5a92378a8167486d5148c1e2dff5 (diff) | |
download | rails-139971d3cc06168a69617a61058240afe227af99.tar.gz rails-139971d3cc06168a69617a61058240afe227af99.tar.bz2 rails-139971d3cc06168a69617a61058240afe227af99.zip |
Now accepting css/js files in deeper directory structures by default.
This is useful for engines with own application.{js|css}-files.
See: https://github.com/rails/rails/issues/1520
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/assets_test.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index b76dae8e18..afe93aa732 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -37,14 +37,17 @@ module ApplicationTests test "assets are compiled properly" do app_file "app/assets/javascripts/application.js", "alert();" + app_file "app/assets/javascripts/foo/application.js", "alert();" capture(:stdout) do Dir.chdir(app_path){ `bundle exec rake assets:precompile` } end - - file = Dir["#{app_path}/public/assets/application-*.js"][0] - assert_not_nil file, "Expected application.js asset to be generated, but none found" - assert_equal "alert();\n", File.read(file) + files = Dir["#{app_path}/public/assets/application-*.js"] + files << Dir["#{app_path}/public/assets/foo/application-*.js"].first + files.each do |file| + assert_not_nil file, "Expected application.js asset to be generated, but none found" + assert_equal "alert();\n", File.read(file) + end end test "assets are cleaned up properly" do |