TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Now accepting css/js files in deeper directory structures by default.

Browse Source 
This is useful for engines with own application.{js|css}-files.
See: https://github.com/rails/rails/issues/1520
This commit is contained in:
Tobias Schlottke 2011-07-01 09:53:48 +02:00
parent cb99c8593a
commit 139971d3cc
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
railties/lib/rails/application/configuration.rb
View File

@ -34,7 +34,7 @@ def initialize(*)
@assets = ActiveSupport::OrderedOptions.new
@assets.enabled = false
@assets.paths = []
@assets.precompile = [ /\w+\.(?!js|css).+/, "application.js", "application.css" ]
@assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
@assets.prefix = "/assets"
@assets.js_compressor = nil

11
railties/test/application/assets_test.rb
View File

@ -37,14 +37,17 @@ def app
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