Merge pull request #1926 from tobsch/master

Accept application.js/.css to exist in a deeper directory depth by default
rails · Jul 6, 2011 · 6191368 · 6191368
2 parents 2c72830 + 139971d
commit 6191368
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
@@ -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

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
@@ -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
-
+      files = Dir["#{app_path}/public/assets/application-*.js"]
-      file = Dir["#{app_path}/public/assets/application-*.js"][0]
+      files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
-      assert_not_nil file, "Expected application.js asset to be generated, but none found"
+      files.each do |file|
-      assert_equal "alert();\n", File.read(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