diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-21 18:25:40 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-21 18:25:40 -0700 |
commit | 2bf33bd4bcd488a35e641b32dd667f3092ea9197 (patch) | |
tree | 79d7b708510f1329b003b585ade51f0da6a235c1 /railties/test/application | |
parent | 676ddfcf714c78024f75e37714e8eda484c3fad2 (diff) | |
parent | 6e63e029b335b1a5dfce43c20de27ca6fae29fa4 (diff) | |
download | rails-2bf33bd4bcd488a35e641b32dd667f3092ea9197.tar.gz rails-2bf33bd4bcd488a35e641b32dd667f3092ea9197.tar.bz2 rails-2bf33bd4bcd488a35e641b32dd667f3092ea9197.zip |
Merge pull request #3027 from alex3/assets-precompile-regex-fix
Default precompile regex was erroneously matching files
Diffstat (limited to 'railties/test/application')
-rw-r--r-- | railties/test/application/assets_test.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index dfd950aae3..a62ef1e70e 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -68,6 +68,10 @@ module ApplicationTests test "precompile application.js and application.css and all other files not ending with .js or .css by default" do app_file "app/assets/javascripts/application.js", "alert();" app_file "app/assets/stylesheets/application.css", "body{}" + + app_file "app/assets/javascripts/someapplication.js", "alert();" + app_file "app/assets/stylesheets/someapplication.css", "body{}" + app_file "app/assets/javascripts/something.min.js", "alert();" app_file "app/assets/stylesheets/something.min.css", "body{}" @@ -87,8 +91,13 @@ module ApplicationTests images_should_compile.each do |filename| assert File.exists?("#{app_path}/public/assets/#{filename}") end + assert File.exists?("#{app_path}/public/assets/application.js") assert File.exists?("#{app_path}/public/assets/application.css") + + assert !File.exists?("#{app_path}/public/assets/someapplication.js") + assert !File.exists?("#{app_path}/public/assets/someapplication.css") + assert !File.exists?("#{app_path}/public/assets/something.min.js") assert !File.exists?("#{app_path}/public/assets/something.min.css") end |