From 6dda2167154c856e8776a192e90118c3b3129b78 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 1 Aug 2011 12:32:17 -0700
Subject: Merge pull request #2324 from zenapsis/3-1-stable

Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories
---
 railties/test/application/assets_test.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 7fb930bd99..802b737483 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -109,5 +109,19 @@ module ApplicationTests
       assert_match "alert()", last_response.body
       assert_equal nil, last_response.headers["Set-Cookie"]
     end
+
+    test "files in any assets/ directories are not added to Sprockets" do
+      %w[app lib vendor].each do |dir|
+        app_file "#{dir}/assets/#{dir}_test.erb", "testing"
+      end
+
+      app_file "app/assets/javascripts/demo.js", "alert();"
+
+      require "#{app_path}/config/environment"
+
+      get "/assets/demo.js"
+      assert_match "alert();", last_response.body
+      assert_equal 200, last_response.status
+    end
   end
 end
-- 
cgit v1.2.3


From 050c1510b6041a0de21899de1c08d2b816ec0e66 Mon Sep 17 00:00:00 2001
From: Ilya Grigorik <ilya@igvita.com>
Date: Thu, 4 Aug 2011 19:17:03 -0400
Subject: Clear out tmp/cache when assets:clean is invoked.

Otherwise, if bad data is cached in tmp/clear then the next invocation
of assets:precompile (or a regular incoming request) will pickup files from
tmp without regenerating them from source.
---
 railties/test/application/assets_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 802b737483..38dd3f5a3f 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -80,7 +80,7 @@ module ApplicationTests
         Dir.chdir(app_path){ `bundle exec rake assets:clean` }
       end
 
-      files = Dir["#{app_path}/public/assets/**/*"]
+      files = Dir["#{app_path}/public/assets/**/*", "#{app_path}/tmp/cache/*"]
       assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}"
     end
 
-- 
cgit v1.2.3


From 4ca605b71b0482c34c735b63b94ed001786c7125 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 15 Aug 2011 15:31:47 -0300
Subject: rake assets:precompile executes in production environment as default
 if RAILS_ENV was not provided

---
 railties/test/application/assets_test.rb | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 38dd3f5a3f..ccc03f8d9c 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -46,28 +46,40 @@ module ApplicationTests
       assert defined?(Uglifier)
     end
 
-    test "precompile creates the file and gives it the original asset's content" do
+    test "precompile creates the filem, gives it the original asset's content and run in production as default" do
       app_file "app/assets/javascripts/application.js", "alert();"
       app_file "app/assets/javascripts/foo/application.js", "alert();"
 
+      ENV["RAILS_ENV"] = nil
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
       end
-      files = Dir["#{app_path}/public/assets/application-*.js"]
-      files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
+      files = Dir["#{app_path}/public/assets/application-b29a188b3d9c74ef7cbb7ddf9e99f953.js"]
+      files << Dir["#{app_path}/public/assets/foo/application-b29a188b3d9c74ef7cbb7ddf9e99f953.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)
+        assert_equal "alert()", File.read(file)
       end
     end
 
-    test "precompile appends the md5 hash to files referenced with asset_path" do
+    test "precompile appends the md5 hash to files referenced with asset_path and run in the provided RAILS_ENV" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
 
+      # capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
+      # end
+      file = Dir["#{app_path}/public/assets/application-4bd8b7059c5336ec7ad515c9dbd59974.css"].first
+      assert_match /\/assets\/rails-([0-z]+)\.png/, File.read(file)
+    end
+
+    test "precompile appends the md5 hash to files referenced with asset_path and run in production as default even using RAILS_GROUPS=assets" do
+      app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
+
+      ENV["RAILS_ENV"] = nil
       capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_GROUPS=assets` }
       end
-      file = Dir["#{app_path}/public/assets/application-*.css"].first
+      file = Dir["#{app_path}/public/assets/application-8d301a938f1abfd789bbec87ed1ef770.css"].first
       assert_match /\/assets\/rails-([0-z]+)\.png/, File.read(file)
     end
 
-- 
cgit v1.2.3


From fd29b4e47f498ac259c8d3c3fcfaa61c99f2972a Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 15 Aug 2011 15:35:47 -0300
Subject: Fix typo

---
 railties/test/application/assets_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index ccc03f8d9c..7e68de5674 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -46,7 +46,7 @@ module ApplicationTests
       assert defined?(Uglifier)
     end
 
-    test "precompile creates the filem, gives it the original asset's content and run in production as default" do
+    test "precompile creates the file, gives it the original asset's content and run in production as default" do
       app_file "app/assets/javascripts/application.js", "alert();"
       app_file "app/assets/javascripts/foo/application.js", "alert();"
 
-- 
cgit v1.2.3


From 590239156714c03ad525b2248a11a3f34da3aa6a Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 16 Aug 2011 16:37:56 +0100
Subject: Fix assets tests in railties

---
 railties/test/application/assets_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 7e68de5674..a8d1382e94 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -54,8 +54,8 @@ module ApplicationTests
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
       end
-      files = Dir["#{app_path}/public/assets/application-b29a188b3d9c74ef7cbb7ddf9e99f953.js"]
-      files << Dir["#{app_path}/public/assets/foo/application-b29a188b3d9c74ef7cbb7ddf9e99f953.js"].first
+      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()", File.read(file)
@@ -68,7 +68,7 @@ module ApplicationTests
       # capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
       # end
-      file = Dir["#{app_path}/public/assets/application-4bd8b7059c5336ec7ad515c9dbd59974.css"].first
+      file = Dir["#{app_path}/public/assets/application-*.css"].first
       assert_match /\/assets\/rails-([0-z]+)\.png/, File.read(file)
     end
 
@@ -79,7 +79,7 @@ module ApplicationTests
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_GROUPS=assets` }
       end
-      file = Dir["#{app_path}/public/assets/application-8d301a938f1abfd789bbec87ed1ef770.css"].first
+      file = Dir["#{app_path}/public/assets/application-*.css"].first
       assert_match /\/assets\/rails-([0-z]+)\.png/, File.read(file)
     end
 
-- 
cgit v1.2.3


From 827cdae6fb5e21056b68ab8a89047ae82738871f Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 22 Aug 2011 23:19:25 -0500
Subject: Add config.allow_debugging option to determine if the debug_assets
 query param can be passed by user

---
 railties/test/application/assets_test.rb | 42 ++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index a8d1382e94..1e6a93dbdf 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -135,5 +135,47 @@ module ApplicationTests
       assert_match "alert();", last_response.body
       assert_equal 200, last_response.status
     end
+
+    test "assets are concatenated when debug is off and allow_debugging is off either if debug_assets param is provided" do
+      app_with_assets_in_view
+
+      # config.assets.debug and config.assets.allow_debugging are false for production environment
+      ENV["RAILS_ENV"] = "production"
+      require "#{app_path}/config/environment"
+
+      class ::PostsController < ActionController::Base ; end
+
+      # the debug_assets params isn't used if allow_debugging is off
+      get '/posts?debug_assets=true'
+      assert_match /<script src="\/assets\/application-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body
+      assert_not_match /<script src="\/assets\/xmlhr-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body
+    end
+
+    test "assets aren't concatened when allow_debugging is on and debug_assets params is true" do
+      app_with_assets_in_view
+      app_file "config/initializers/allow_debugging.rb", "Rails.application.config.assets.allow_debugging = true"
+
+      ENV["RAILS_ENV"] = "production"
+      require "#{app_path}/config/environment"
+
+      class ::PostsController < ActionController::Base ; end
+
+      get '/posts?debug_assets=true'
+      assert_match /<script src="\/assets\/application-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body
+      assert_match /<script src="\/assets\/xmlhr-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body
+    end
+
+    private
+    def app_with_assets_in_view
+      app_file "app/assets/javascripts/application.js", "//= require_tree ."
+      app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
+      app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'application' %>"
+
+      app_file "config/routes.rb", <<-RUBY
+        AppTemplate::Application.routes.draw do
+          match '/posts', :to => "posts#index"
+        end
+      RUBY
+    end
   end
 end
-- 
cgit v1.2.3


From 372892eaeadb8174fcca6c955b46890da2a07abc Mon Sep 17 00:00:00 2001
From: Daniel Schierbeck <daniel.schierbeck@gmail.com>
Date: Thu, 25 Aug 2011 11:40:10 +0200
Subject: Move asset debugging tests into a separate test case

Also:

- Refactor AssetDebuggingTest.
- Use the %r regexp syntax. That way we don't need to escape the /'s.
---
 railties/test/application/assets_test.rb | 42 --------------------------------
 1 file changed, 42 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 1e6a93dbdf..a8d1382e94 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -135,47 +135,5 @@ module ApplicationTests
       assert_match "alert();", last_response.body
       assert_equal 200, last_response.status
     end
-
-    test "assets are concatenated when debug is off and allow_debugging is off either if debug_assets param is provided" do
-      app_with_assets_in_view
-
-      # config.assets.debug and config.assets.allow_debugging are false for production environment
-      ENV["RAILS_ENV"] = "production"
-      require "#{app_path}/config/environment"
-
-      class ::PostsController < ActionController::Base ; end
-
-      # the debug_assets params isn't used if allow_debugging is off
-      get '/posts?debug_assets=true'
-      assert_match /<script src="\/assets\/application-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body
-      assert_not_match /<script src="\/assets\/xmlhr-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body
-    end
-
-    test "assets aren't concatened when allow_debugging is on and debug_assets params is true" do
-      app_with_assets_in_view
-      app_file "config/initializers/allow_debugging.rb", "Rails.application.config.assets.allow_debugging = true"
-
-      ENV["RAILS_ENV"] = "production"
-      require "#{app_path}/config/environment"
-
-      class ::PostsController < ActionController::Base ; end
-
-      get '/posts?debug_assets=true'
-      assert_match /<script src="\/assets\/application-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body
-      assert_match /<script src="\/assets\/xmlhr-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body
-    end
-
-    private
-    def app_with_assets_in_view
-      app_file "app/assets/javascripts/application.js", "//= require_tree ."
-      app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
-      app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'application' %>"
-
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          match '/posts', :to => "posts#index"
-        end
-      RUBY
-    end
   end
 end
-- 
cgit v1.2.3


From dffdd829930e664cef522f34730d5987be348596 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 29 Aug 2011 16:28:11 -0500
Subject: Read digests of assets from manifest.yml if config.assets.manifest is
 on

---
 railties/test/application/assets_test.rb | 65 ++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index a8d1382e94..9df10e84d8 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -62,6 +62,71 @@ module ApplicationTests
       end
     end
 
+    test "precompile don't create a manifest file when manifest option is off" do
+      app_file "app/assets/javascripts/application.js", "alert();"
+      app_file "config/initializers/manifest.rb", "Rails.application.config.assets.manifest = false"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      assert !File.exist?("#{app_path}/public/assets/manifest.yml")
+    end
+
+    test "precompile creates a manifest file with all the assets listed when manifest option is on" do
+      app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
+      app_file "app/assets/javascripts/application.js", "alert();"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      manifest = "#{app_path}/public/assets/manifest.yml"
+
+      assets = YAML.load_file(manifest)
+      assert_match /application-([0-z]+)\.js/, assets["application.js"]
+      assert_match /application-([0-z]+)\.css/, assets["application.css"]
+    end
+
+    test "assets do not require any assets group gem when manifest option is on and manifest file is present" do
+      app_file "app/assets/javascripts/application.js", "alert();"
+
+      ENV["RAILS_ENV"] = "production"
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+      manifest = "#{app_path}/public/assets/manifest.yml"
+      assets = YAML.load_file(manifest)
+      asset_path = assets["application.js"]
+
+      require "#{app_path}/config/environment"
+
+      # Checking if Uglifier is defined we can know if Sprockets was reached or not
+      assert !defined?(Uglifier)
+      get "/assets/#{asset_path}"
+      assert_match "alert()", last_response.body
+      assert !defined?(Uglifier)
+    end
+
+    test "assets raise AssetNotPrecompiledError if config.assets.precompile_only is on and file isn't precompiled" do
+      app_file "app/assets/javascripts/app.js", "alert();"
+      app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'app' %>"
+      app_file "config/initializers/precompile_only.rb", "Rails.application.config.assets.precompile_only = true"
+
+      app_file "config/routes.rb", <<-RUBY
+        AppTemplate::Application.routes.draw do
+          match '/posts', :to => "posts#index"
+        end
+      RUBY
+
+      ENV["RAILS_ENV"] = "production"
+      require "#{app_path}/config/environment"
+      class ::PostsController < ActionController::Base ; end
+
+      get '/posts'
+      assert_match /AssetNotPrecompiledError/, last_response.body
+    end
+
     test "precompile appends the md5 hash to files referenced with asset_path and run in the provided RAILS_ENV" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
 
-- 
cgit v1.2.3


From f236e00189b5a6cf0cebac5c275f64d41d73428d Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Wed, 31 Aug 2011 12:47:33 -0500
Subject: Backport f443f9cb0c64 to master

---
 railties/test/application/assets_test.rb | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 9df10e84d8..a4d7fc92f5 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -37,6 +37,8 @@ module ApplicationTests
 
     test "assets do not require compressors until it is used" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = true"
+
       ENV["RAILS_ENV"] = "production"
       require "#{app_path}/config/environment"
 
@@ -62,18 +64,7 @@ module ApplicationTests
       end
     end
 
-    test "precompile don't create a manifest file when manifest option is off" do
-      app_file "app/assets/javascripts/application.js", "alert();"
-      app_file "config/initializers/manifest.rb", "Rails.application.config.assets.manifest = false"
-
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
-
-      assert !File.exist?("#{app_path}/public/assets/manifest.yml")
-    end
-
-    test "precompile creates a manifest file with all the assets listed when manifest option is on" do
+    test "precompile creates a manifest file with all the assets listed" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       app_file "app/assets/javascripts/application.js", "alert();"
 
@@ -88,7 +79,7 @@ module ApplicationTests
       assert_match /application-([0-z]+)\.css/, assets["application.css"]
     end
 
-    test "assets do not require any assets group gem when manifest option is on and manifest file is present" do
+    test "assets do not require any assets group gem when manifest file is present" do
       app_file "app/assets/javascripts/application.js", "alert();"
 
       ENV["RAILS_ENV"] = "production"
@@ -108,10 +99,8 @@ module ApplicationTests
       assert !defined?(Uglifier)
     end
 
-    test "assets raise AssetNotPrecompiledError if config.assets.precompile_only is on and file isn't precompiled" do
-      app_file "app/assets/javascripts/app.js", "alert();"
+    test "assets raise AssetNotPrecompiledError when manifest file is present and requested file isn't precompiled" do
       app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'app' %>"
-      app_file "config/initializers/precompile_only.rb", "Rails.application.config.assets.precompile_only = true"
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
@@ -120,15 +109,25 @@ module ApplicationTests
       RUBY
 
       ENV["RAILS_ENV"] = "production"
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      # Create file after of precompile
+      app_file "app/assets/javascripts/app.js", "alert();"
+
       require "#{app_path}/config/environment"
       class ::PostsController < ActionController::Base ; end
 
       get '/posts'
       assert_match /AssetNotPrecompiledError/, last_response.body
+      assert_match /app.js isn't precompiled/, last_response.body
     end
 
     test "precompile appends the md5 hash to files referenced with asset_path and run in the provided RAILS_ENV" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
+      # digest is default in false, we must enable it for test environment
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = true"
 
       # capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
@@ -139,6 +138,7 @@ module ApplicationTests
 
     test "precompile appends the md5 hash to files referenced with asset_path and run in production as default even using RAILS_GROUPS=assets" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = true"
 
       ENV["RAILS_ENV"] = nil
       capture(:stdout) do
-- 
cgit v1.2.3


From d0b3937b8fe2cbc4385e843d47249af3e7181a83 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 30 Aug 2011 16:30:53 -0500
Subject: Set default location of manifest with config.assets.manifest

---
 railties/test/application/assets_test.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index a4d7fc92f5..ccadf0b2c0 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -79,6 +79,23 @@ module ApplicationTests
       assert_match /application-([0-z]+)\.css/, assets["application.css"]
     end
 
+    test "precompile creates a manifest file in a custom path with all the assets listed" do
+      app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
+      app_file "app/assets/javascripts/application.js", "alert();"
+      FileUtils.mkdir "#{app_path}/shared"
+      app_file "config/initializers/manifest.rb", "Rails.application.config.assets.manifest = '#{app_path}/shared'"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      manifest = "#{app_path}/shared/manifest.yml"
+
+      assets = YAML.load_file(manifest)
+      assert_match /application-([0-z]+)\.js/, assets["application.js"]
+      assert_match /application-([0-z]+)\.css/, assets["application.css"]
+    end
+
     test "assets do not require any assets group gem when manifest file is present" do
       app_file "app/assets/javascripts/application.js", "alert();"
 
-- 
cgit v1.2.3


From 3ce3b5b1f1f92d79ee015d246a9f62a725eca5ca Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 31 Aug 2011 18:50:38 -0700
Subject: Merge pull request #2780 from
 guilleiguaran/assets-pipeline-minor-changes

Assets pipeline: fix in manifest location and remove unused code
---
 railties/test/application/assets_test.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index ccadf0b2c0..721d082908 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -96,6 +96,19 @@ module ApplicationTests
       assert_match /application-([0-z]+)\.css/, assets["application.css"]
     end
 
+    test "the manifest file should be saved by default in the same assets folder" do
+      app_file "app/assets/javascripts/application.js", "alert();"
+      app_file "config/initializers/manifest.rb", "Rails.application.config.assets.prefix = '/x'"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      manifest = "#{app_path}/public/x/manifest.yml"
+      assets = YAML.load_file(manifest)
+      assert_match /application-([0-z]+)\.js/, assets["application.js"]
+    end
+
     test "assets do not require any assets group gem when manifest file is present" do
       app_file "app/assets/javascripts/application.js", "alert();"
 
-- 
cgit v1.2.3


From 58b0c9734777a4610e812a48ee64881b4f88b107 Mon Sep 17 00:00:00 2001
From: Sam Pohlenz <sam@sampohlenz.com>
Date: Thu, 1 Sep 2011 09:23:51 +0930
Subject: assets:precompile should not append asset digests when
 config.assets.digest is false

---
 railties/test/application/assets_test.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 721d082908..a412b7d99b 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -67,6 +67,8 @@ module ApplicationTests
     test "precompile creates a manifest file with all the assets listed" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       app_file "app/assets/javascripts/application.js", "alert();"
+      # digest is default in false, we must enable it for test environment
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = true"
 
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
@@ -84,6 +86,8 @@ module ApplicationTests
       app_file "app/assets/javascripts/application.js", "alert();"
       FileUtils.mkdir "#{app_path}/shared"
       app_file "config/initializers/manifest.rb", "Rails.application.config.assets.manifest = '#{app_path}/shared'"
+      # digest is default in false, we must enable it for test environment
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = true"
 
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
@@ -96,9 +100,12 @@ module ApplicationTests
       assert_match /application-([0-z]+)\.css/, assets["application.css"]
     end
 
+
     test "the manifest file should be saved by default in the same assets folder" do
       app_file "app/assets/javascripts/application.js", "alert();"
       app_file "config/initializers/manifest.rb", "Rails.application.config.assets.prefix = '/x'"
+      # digest is default in false, we must enable it for test environment
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = true"
 
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
@@ -109,6 +116,25 @@ module ApplicationTests
       assert_match /application-([0-z]+)\.js/, assets["application.js"]
     end
 
+    test "precompile does not append asset digests when config.assets.digest is false" do
+      app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
+      app_file "app/assets/javascripts/application.js", "alert();"
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = false"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      assert File.exists?("#{app_path}/public/assets/application.js")
+      assert File.exists?("#{app_path}/public/assets/application.css")
+
+      manifest = "#{app_path}/public/assets/manifest.yml"
+
+      assets = YAML.load_file(manifest)
+      assert_equal "application.js", assets["application.js"]
+      assert_equal "application.css", assets["application.css"]
+    end
+
     test "assets do not require any assets group gem when manifest file is present" do
       app_file "app/assets/javascripts/application.js", "alert();"
 
-- 
cgit v1.2.3


From c8d0dc376a72b976ccef17b8d0b413961b306a5f Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Sun, 4 Sep 2011 08:23:13 +0530
Subject: Warnings removed for "assert_match /" Please do not add more.!

---
 railties/test/application/assets_test.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index a412b7d99b..1e0a26918b 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -77,8 +77,8 @@ module ApplicationTests
       manifest = "#{app_path}/public/assets/manifest.yml"
 
       assets = YAML.load_file(manifest)
-      assert_match /application-([0-z]+)\.js/, assets["application.js"]
-      assert_match /application-([0-z]+)\.css/, assets["application.css"]
+      assert_match(/application-([0-z]+)\.js/, assets["application.js"])
+      assert_match(/application-([0-z]+)\.css/, assets["application.css"])
     end
 
     test "precompile creates a manifest file in a custom path with all the assets listed" do
@@ -96,8 +96,8 @@ module ApplicationTests
       manifest = "#{app_path}/shared/manifest.yml"
 
       assets = YAML.load_file(manifest)
-      assert_match /application-([0-z]+)\.js/, assets["application.js"]
-      assert_match /application-([0-z]+)\.css/, assets["application.css"]
+      assert_match(/application-([0-z]+)\.js/, assets["application.js"])
+      assert_match(/application-([0-z]+)\.css/, assets["application.css"])
     end
 
 
@@ -113,7 +113,7 @@ module ApplicationTests
 
       manifest = "#{app_path}/public/x/manifest.yml"
       assets = YAML.load_file(manifest)
-      assert_match /application-([0-z]+)\.js/, assets["application.js"]
+      assert_match(/application-([0-z]+)\.js/, assets["application.js"])
     end
 
     test "precompile does not append asset digests when config.assets.digest is false" do
@@ -176,8 +176,8 @@ module ApplicationTests
       class ::PostsController < ActionController::Base ; end
 
       get '/posts'
-      assert_match /AssetNotPrecompiledError/, last_response.body
-      assert_match /app.js isn't precompiled/, last_response.body
+      assert_match(/AssetNotPrecompiledError/, last_response.body)
+      assert_match(/app.js isn't precompiled/, last_response.body)
     end
 
     test "precompile appends the md5 hash to files referenced with asset_path and run in the provided RAILS_ENV" do
@@ -189,7 +189,7 @@ module ApplicationTests
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
       # end
       file = Dir["#{app_path}/public/assets/application-*.css"].first
-      assert_match /\/assets\/rails-([0-z]+)\.png/, File.read(file)
+      assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file))
     end
 
     test "precompile appends the md5 hash to files referenced with asset_path and run in production as default even using RAILS_GROUPS=assets" do
@@ -201,7 +201,7 @@ module ApplicationTests
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_GROUPS=assets` }
       end
       file = Dir["#{app_path}/public/assets/application-*.css"].first
-      assert_match /\/assets\/rails-([0-z]+)\.png/, File.read(file)
+      assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file))
     end
 
     test "assets are cleaned up properly" do
-- 
cgit v1.2.3


From 9bc0082f299436552aabd101f5bcb6bc2fbd6a43 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sun, 4 Sep 2011 17:24:01 -0500
Subject: AssetNotPrecompiledError should be raise when config.assets.digest =
 false, config.assets.compile = false and manifest file isn't present

---
 railties/test/application/assets_test.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 1e0a26918b..3c7d178d37 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -180,6 +180,32 @@ module ApplicationTests
       assert_match(/app.js isn't precompiled/, last_response.body)
     end
 
+    test "assets raise AssetNotPrecompiledError when manifest file is present and requested file isn't precompiled if digest is disabled" do
+      app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'app' %>"
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = false"
+
+      app_file "config/routes.rb", <<-RUBY
+        AppTemplate::Application.routes.draw do
+          match '/posts', :to => "posts#index"
+        end
+      RUBY
+
+      ENV["RAILS_ENV"] = "development"
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      # Create file after of precompile
+      app_file "app/assets/javascripts/app.js", "alert();"
+
+      require "#{app_path}/config/environment"
+      class ::PostsController < ActionController::Base ; end
+
+      get '/posts'
+      assert_match(/AssetNotPrecompiledError/, last_response.body)
+      assert_match(/app.js isn't precompiled/, last_response.body)
+    end
+
     test "precompile appends the md5 hash to files referenced with asset_path and run in the provided RAILS_ENV" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       # digest is default in false, we must enable it for test environment
-- 
cgit v1.2.3


From 6fc518e2ec59ec00076aaca08b9e3df3baee54a3 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 6 Sep 2011 09:24:22 -0500
Subject: config.action_controller.perform_caching isn't used anymore in assets
 pipeline, instead we are using config.assets.digest now

---
 railties/test/application/assets_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 3c7d178d37..8a5cafe71b 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -64,6 +64,15 @@ module ApplicationTests
       end
     end
 
+    test "asset pipeline should use a Sprockets::Index when config.assets.digest is true" do
+      app_file "config/initializers/digest.rb", "Rails.application.config.assets.digest = true"
+      app_file "config/initializers/caching.rb", "Rails.application.config.action_controller.perform_caching = false"
+      ENV["RAILS_ENV"] = "production"
+      require "#{app_path}/config/environment"
+
+      assert_equal Sprockets::Index, Rails.application.assets.class
+    end
+
     test "precompile creates a manifest file with all the assets listed" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       app_file "app/assets/javascripts/application.js", "alert();"
-- 
cgit v1.2.3


From 1db58367546ef9e5ce03e34ca90ea535dabb674e Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 6 Sep 2011 23:00:36 -0500
Subject: Refactor assets tests to use add_to_config instead of creating
 initializers with config values

---
 railties/test/application/assets_test.rb | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 8a5cafe71b..b9d8c002d7 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -37,7 +37,7 @@ module ApplicationTests
 
     test "assets do not require compressors until it is used" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = true"
+      add_to_config "config.assets.compile = true"
 
       ENV["RAILS_ENV"] = "production"
       require "#{app_path}/config/environment"
@@ -65,8 +65,9 @@ module ApplicationTests
     end
 
     test "asset pipeline should use a Sprockets::Index when config.assets.digest is true" do
-      app_file "config/initializers/digest.rb", "Rails.application.config.assets.digest = true"
-      app_file "config/initializers/caching.rb", "Rails.application.config.action_controller.perform_caching = false"
+      add_to_config "config.assets.digest = true"
+      add_to_config "config.action_controller.perform_caching = false"
+
       ENV["RAILS_ENV"] = "production"
       require "#{app_path}/config/environment"
 
@@ -77,7 +78,7 @@ module ApplicationTests
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       app_file "app/assets/javascripts/application.js", "alert();"
       # digest is default in false, we must enable it for test environment
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = true"
+      add_to_config "config.assets.digest = true"
 
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
@@ -93,10 +94,10 @@ module ApplicationTests
     test "precompile creates a manifest file in a custom path with all the assets listed" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       app_file "app/assets/javascripts/application.js", "alert();"
-      FileUtils.mkdir "#{app_path}/shared"
-      app_file "config/initializers/manifest.rb", "Rails.application.config.assets.manifest = '#{app_path}/shared'"
       # digest is default in false, we must enable it for test environment
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = true"
+      add_to_config "config.assets.digest = true"
+      add_to_config "config.assets.manifest = '#{app_path}/shared'"
+      FileUtils.mkdir "#{app_path}/shared"
 
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
@@ -112,9 +113,9 @@ module ApplicationTests
 
     test "the manifest file should be saved by default in the same assets folder" do
       app_file "app/assets/javascripts/application.js", "alert();"
-      app_file "config/initializers/manifest.rb", "Rails.application.config.assets.prefix = '/x'"
       # digest is default in false, we must enable it for test environment
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = true"
+      add_to_config "config.assets.digest = true"
+      add_to_config "config.assets.prefix = '/x'"
 
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
@@ -128,7 +129,7 @@ module ApplicationTests
     test "precompile does not append asset digests when config.assets.digest is false" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       app_file "app/assets/javascripts/application.js", "alert();"
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = false"
+      add_to_config "config.assets.digest = false"
 
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
@@ -191,7 +192,7 @@ module ApplicationTests
 
     test "assets raise AssetNotPrecompiledError when manifest file is present and requested file isn't precompiled if digest is disabled" do
       app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'app' %>"
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = false"
+      add_to_config "config.assets.compile = false"
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
@@ -218,7 +219,7 @@ module ApplicationTests
     test "precompile appends the md5 hash to files referenced with asset_path and run in the provided RAILS_ENV" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       # digest is default in false, we must enable it for test environment
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.digest = true"
+      add_to_config "config.assets.digest = true"
 
       # capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
@@ -229,7 +230,7 @@ module ApplicationTests
 
     test "precompile appends the md5 hash to files referenced with asset_path and run in production as default even using RAILS_GROUPS=assets" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = true"
+      add_to_config "config.assets.compile = true"
 
       ENV["RAILS_ENV"] = nil
       capture(:stdout) do
-- 
cgit v1.2.3


From 901c02d86a1e2cccc8cc2c6ea9ec3f68a6c72607 Mon Sep 17 00:00:00 2001
From: Alex Yakoubian <alex@simplevue.com>
Date: Thu, 8 Sep 2011 13:44:08 -0700
Subject: Fixed assets precompile regex, now accepts Procs

---
 railties/test/application/assets_test.rb | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index b9d8c002d7..b8a8665b3e 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -64,6 +64,34 @@ module ApplicationTests
       end
     end
 
+    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/something.min.js", "alert();"
+      app_file "app/assets/stylesheets/something.min.css", "body{}"
+
+      images_should_compile = ["a.png", "happyface.png", "happy_face.png", "happy.face.png",
+                               "happy-face.png", "happy.happy_face.png", "happy_happy.face.png", 
+                               "happy.happy.face.png", "happy", "happy.face", "-happyface",
+                               "-happy.png", "-happy.face.png", "_happyface", "_happy.face.png",
+                               "_happy.png"]
+      images_should_compile.each do |filename|
+        app_file "app/assets/images/#{filename}", "happy"
+      end
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      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/something.min.js")
+      assert !File.exists?("#{app_path}/public/assets/something.min.css")
+    end
+
     test "asset pipeline should use a Sprockets::Index when config.assets.digest is true" do
       add_to_config "config.assets.digest = true"
       add_to_config "config.action_controller.perform_caching = false"
-- 
cgit v1.2.3


From e767cda6ea171cf888c8e46b0c62e3c7df801a38 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 13 Sep 2011 03:19:02 -0500
Subject: Move asset tests to assets_test file

---
 railties/test/application/assets_test.rb | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index b8a8665b3e..95fcb4a3dd 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'isolation/abstract_unit'
 require 'active_support/core_ext/kernel/reporting'
 require 'rack/test'
@@ -268,6 +269,36 @@ module ApplicationTests
       assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file))
     end
 
+    test "precompile ignore asset_host" do
+      app_file "app/assets/javascripts/application.css.erb", "<%= asset_path 'rails.png' %>"
+      add_to_config "config.action_controller.asset_host = Proc.new { |source, request| 'http://www.example.com/' }"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      file = Dir["#{app_path}/public/assets/application.css"].first
+      content = File.read(file)
+      assert_match(/\/assets\/rails-([0-z]+)\.png/, content)
+      assert_no_match(/www\.example\.com/, content)
+    end
+
+    test "precompile should handle utf8 filenames" do
+      app_file "app/assets/images/レイルズ.png", "not a image really"
+      add_to_config "config.assets.precompile = [ /\.png$$/, /application.(css|js)$/ ]"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      assert File.exists?("#{app_path}/public/assets/レイルズ.png")
+
+      manifest = "#{app_path}/public/assets/manifest.yml"
+
+      assets = YAML.load_file(manifest)
+      assert_equal "レイルズ.png", assets["レイルズ.png"]
+    end
+
     test "assets are cleaned up properly" do
       app_file "public/assets/application.js", "alert();"
       app_file "public/assets/application.css", "a { color: green; }"
-- 
cgit v1.2.3


From a65010fddb00ceb9356f8ccb797405a86a1d8b9f Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 13 Sep 2011 04:35:12 -0500
Subject: Fix precompile asset_host test

---
 railties/test/application/assets_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 95fcb4a3dd..0901c6df3d 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -279,7 +279,7 @@ module ApplicationTests
 
       file = Dir["#{app_path}/public/assets/application.css"].first
       content = File.read(file)
-      assert_match(/\/assets\/rails-([0-z]+)\.png/, content)
+      assert_match(/\/assets\/rails.png/, content)
       assert_no_match(/www\.example\.com/, content)
     end
 
-- 
cgit v1.2.3


From 82afaa06861d03f6a2887d40e40c0ded76db88db Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 13 Sep 2011 15:16:53 -0700
Subject: Provide a way to access to assets without using the digest, useful
 for static files and emails

---
 railties/test/application/assets_test.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 0901c6df3d..9245532e17 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -58,7 +58,9 @@ module ApplicationTests
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
       end
       files = Dir["#{app_path}/public/assets/application-*.js"]
+      files << Dir["#{app_path}/public/assets/application.js"].first
       files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
+      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()", File.read(file)
-- 
cgit v1.2.3


From f22407dd34024886edd8a8f618dc0b19152776a0 Mon Sep 17 00:00:00 2001
From: "Mark J. Titorenko" <mark@titorenko.net>
Date: Tue, 6 Sep 2011 10:34:24 +0100
Subject: Don't mount Sprockets at config.assets.prefix if
 config.assets.compile is false.

---
 railties/test/application/assets_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 9245532e17..0c40b88cf9 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -178,6 +178,7 @@ module ApplicationTests
 
     test "assets do not require any assets group gem when manifest file is present" do
       app_file "app/assets/javascripts/application.js", "alert();"
+      app_file "config/initializers/serve_static_assets.rb", "Rails.application.config.serve_static_assets = true"
 
       ENV["RAILS_ENV"] = "production"
       capture(:stdout) do
@@ -314,6 +315,17 @@ module ApplicationTests
       assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}"
     end
 
+    test "assets routes are not drawn when compilation is disabled" do
+      app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = false"
+
+      ENV["RAILS_ENV"] = "production"
+      require "#{app_path}/config/environment"
+
+      get "/assets/demo.js"
+      assert_equal 404, last_response.status
+    end
+
     test "does not stream session cookies back" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
 
-- 
cgit v1.2.3


From a89d39ec889c2658120e508bd182de7be3ccdcc9 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 13 Sep 2011 18:36:38 -0500
Subject: Fix broken asset test

---
 railties/test/application/assets_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 0c40b88cf9..9b141ccbac 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -38,7 +38,7 @@ module ApplicationTests
 
     test "assets do not require compressors until it is used" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
-      add_to_config "config.assets.compile = true"
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = true"
 
       ENV["RAILS_ENV"] = "production"
       require "#{app_path}/config/environment"
@@ -317,7 +317,7 @@ module ApplicationTests
 
     test "assets routes are not drawn when compilation is disabled" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = false"
+      add_to_config "config.assets.compile = false"
 
       ENV["RAILS_ENV"] = "production"
       require "#{app_path}/config/environment"
-- 
cgit v1.2.3


From 0d48b3afa98375cf71ea0ad731eaac6c309fbb57 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 14 Sep 2011 00:29:03 -0700
Subject: Revert "Provide a way to access to assets without using the digest,
 useful for static files and emails"

This reverts commit 82afaa06861d03f6a2887d40e40c0ded76db88db.
---
 railties/test/application/assets_test.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 9b141ccbac..959914bcea 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -58,9 +58,7 @@ module ApplicationTests
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
       end
       files = Dir["#{app_path}/public/assets/application-*.js"]
-      files << Dir["#{app_path}/public/assets/application.js"].first
       files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
-      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()", File.read(file)
-- 
cgit v1.2.3


From b50394bf844d0520d5dca485b169bba87f6d009a Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Thu, 15 Sep 2011 19:55:52 -0500
Subject: config.action_controller.asset_host shouldn't set to nil during
 precompile

---
 railties/test/application/assets_test.rb | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 959914bcea..dfd950aae3 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -270,20 +270,6 @@ module ApplicationTests
       assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file))
     end
 
-    test "precompile ignore asset_host" do
-      app_file "app/assets/javascripts/application.css.erb", "<%= asset_path 'rails.png' %>"
-      add_to_config "config.action_controller.asset_host = Proc.new { |source, request| 'http://www.example.com/' }"
-
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
-
-      file = Dir["#{app_path}/public/assets/application.css"].first
-      content = File.read(file)
-      assert_match(/\/assets\/rails.png/, content)
-      assert_no_match(/www\.example\.com/, content)
-    end
-
     test "precompile should handle utf8 filenames" do
       app_file "app/assets/images/レイルズ.png", "not a image really"
       add_to_config "config.assets.precompile = [ /\.png$$/, /application.(css|js)$/ ]"
-- 
cgit v1.2.3


From 6e63e029b335b1a5dfce43c20de27ca6fae29fa4 Mon Sep 17 00:00:00 2001
From: Alex Yakoubian <alex@simplevue.com>
Date: Wed, 14 Sep 2011 23:14:23 -0700
Subject: Default precompile regexp that properly matches application.js and
 application.css

---
 railties/test/application/assets_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

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
-- 
cgit v1.2.3


From 9d46823b5d00e78c6ffaaae731a9a7acf6bb2b14 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Thu, 22 Sep 2011 12:03:59 -0500
Subject: set env to let rails know we're precompiling

---
 railties/test/application/assets_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index a62ef1e70e..c4a24f0f73 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -102,6 +102,15 @@ module ApplicationTests
       assert !File.exists?("#{app_path}/public/assets/something.min.css")
     end
 
+    test "precompile sets flag notifying rails its precompiling" do
+      compile = <<COMPILE
+raise "ENV RAILS_ASSETS_PRECOMPILE not set" unless ENV["RAILS_ASSETS_PRECOMPILE"]
+COMPILE
+      app_file "config/initializers/compile.rb", compile
+      Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      assert $?.success?
+    end
+
     test "asset pipeline should use a Sprockets::Index when config.assets.digest is true" do
       add_to_config "config.assets.digest = true"
       add_to_config "config.action_controller.perform_caching = false"
-- 
cgit v1.2.3


From eb367afeed2905d1036f46940aa6c91323f7faab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Sep 2011 01:56:49 +0200
Subject: `rake assets:precompile` loads the application but does not
 initialize it.

To the app developer, this means configuration add in
config/initializers/* will not be executed.

Plugins developers need to special case their initializers that are
meant to be run in the assets group by adding :group => :assets.

Conflicts:

	railties/CHANGELOG
	railties/test/application/assets_test.rb
---
 railties/test/application/assets_test.rb | 110 ++++++++++++++++++++-----------
 1 file changed, 72 insertions(+), 38 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index c4a24f0f73..fb570d8f47 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -21,6 +21,12 @@ module ApplicationTests
       @app ||= Rails.application
     end
 
+    def precompile!
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+    end
+
     test "assets routes have higher priority" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
 
@@ -38,7 +44,7 @@ module ApplicationTests
 
     test "assets do not require compressors until it is used" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
-      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = true"
+      add_to_env_config "production", "config.assets.compile = true"
 
       ENV["RAILS_ENV"] = "production"
       require "#{app_path}/config/environment"
@@ -54,9 +60,8 @@ module ApplicationTests
       app_file "app/assets/javascripts/foo/application.js", "alert();"
 
       ENV["RAILS_ENV"] = nil
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
+      precompile!
+
       files = Dir["#{app_path}/public/assets/application-*.js"]
       files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
       files.each do |file|
@@ -80,13 +85,12 @@ module ApplicationTests
                                "happy.happy.face.png", "happy", "happy.face", "-happyface",
                                "-happy.png", "-happy.face.png", "_happyface", "_happy.face.png",
                                "_happy.png"]
+
       images_should_compile.each do |filename|
         app_file "app/assets/images/#{filename}", "happy"
       end
 
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
+      precompile!
 
       images_should_compile.each do |filename|
         assert File.exists?("#{app_path}/public/assets/#{filename}")
@@ -103,11 +107,12 @@ module ApplicationTests
     end
 
     test "precompile sets flag notifying rails its precompiling" do
-      compile = <<COMPILE
-raise "ENV RAILS_ASSETS_PRECOMPILE not set" unless ENV["RAILS_ASSETS_PRECOMPILE"]
-COMPILE
-      app_file "config/initializers/compile.rb", compile
-      Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      add_to_config = <<-RUBY
+        initializer :check_assets_precompile, :group => :assets do
+          raise "ENV RAILS_ASSETS_PRECOMPILE not set" unless ENV["RAILS_ASSETS_PRECOMPILE"]
+        end
+      RUBY
+      precompile!
       assert $?.success?
     end
 
@@ -127,9 +132,7 @@ COMPILE
       # digest is default in false, we must enable it for test environment
       add_to_config "config.assets.digest = true"
 
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
+      precompile!
 
       manifest = "#{app_path}/public/assets/manifest.yml"
 
@@ -146,9 +149,7 @@ COMPILE
       add_to_config "config.assets.manifest = '#{app_path}/shared'"
       FileUtils.mkdir "#{app_path}/shared"
 
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
+      precompile!
 
       manifest = "#{app_path}/shared/manifest.yml"
 
@@ -164,9 +165,7 @@ COMPILE
       add_to_config "config.assets.digest = true"
       add_to_config "config.assets.prefix = '/x'"
 
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
+      precompile!
 
       manifest = "#{app_path}/public/x/manifest.yml"
       assets = YAML.load_file(manifest)
@@ -178,9 +177,7 @@ COMPILE
       app_file "app/assets/javascripts/application.js", "alert();"
       add_to_config "config.assets.digest = false"
 
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
+      precompile!
 
       assert File.exists?("#{app_path}/public/assets/application.js")
       assert File.exists?("#{app_path}/public/assets/application.css")
@@ -194,12 +191,11 @@ COMPILE
 
     test "assets do not require any assets group gem when manifest file is present" do
       app_file "app/assets/javascripts/application.js", "alert();"
-      app_file "config/initializers/serve_static_assets.rb", "Rails.application.config.serve_static_assets = true"
+      add_to_env_config "production", "config.serve_static_assets = true"
 
       ENV["RAILS_ENV"] = "production"
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
+      precompile!
+
       manifest = "#{app_path}/public/assets/manifest.yml"
       assets = YAML.load_file(manifest)
       asset_path = assets["application.js"]
@@ -223,9 +219,7 @@ COMPILE
       RUBY
 
       ENV["RAILS_ENV"] = "production"
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
+      precompile!
 
       # Create file after of precompile
       app_file "app/assets/javascripts/app.js", "alert();"
@@ -249,9 +243,7 @@ COMPILE
       RUBY
 
       ENV["RAILS_ENV"] = "development"
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
+      precompile!
 
       # Create file after of precompile
       app_file "app/assets/javascripts/app.js", "alert();"
@@ -292,10 +284,7 @@ COMPILE
       app_file "app/assets/images/レイルズ.png", "not a image really"
       add_to_config "config.assets.precompile = [ /\.png$$/, /application.(css|js)$/ ]"
 
-      capture(:stdout) do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
-      end
-
+      precompile!
       assert File.exists?("#{app_path}/public/assets/レイルズ.png")
 
       manifest = "#{app_path}/public/assets/manifest.yml"
@@ -367,5 +356,50 @@ COMPILE
       assert_match "alert();", last_response.body
       assert_equal 200, last_response.status
     end
+
+    test "assets are concatenated when debug is off and compile is off either if debug_assets param is provided" do
+      app_with_assets_in_view
+
+      # config.assets.debug and config.assets.compile are false for production environment
+      ENV["RAILS_ENV"] = "production"
+      precompile!
+
+      require "#{app_path}/config/environment"
+
+      class ::PostsController < ActionController::Base ; end
+
+      # the debug_assets params isn't used if compile is off
+      get '/posts?debug_assets=true'
+      assert_match(/<script src="\/assets\/application-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body)
+      assert_no_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body)
+    end
+
+    test "assets aren't concatened when compile is true is on and debug_assets params is true" do
+      app_with_assets_in_view
+      add_to_env_config "production", "config.assets.compile  = true"
+      add_to_env_config "production", "config.assets.allow_debugging = true"
+
+      ENV["RAILS_ENV"] = "production"
+      require "#{app_path}/config/environment"
+
+      class ::PostsController < ActionController::Base ; end
+
+      get '/posts?debug_assets=true'
+      assert_match(/<script src="\/assets\/application-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body)
+    end
+
+    private
+    def app_with_assets_in_view
+      app_file "app/assets/javascripts/application.js", "//= require_tree ."
+      app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
+      app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'application' %>"
+
+      app_file "config/routes.rb", <<-RUBY
+        AppTemplate::Application.routes.draw do
+          match '/posts', :to => "posts#index"
+        end
+      RUBY
+    end
   end
 end
-- 
cgit v1.2.3


From 6795a9b30905a6e0b28a8d5458b452cb385d21b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Sep 2011 02:15:18 +0200
Subject: Remove the ENV flag, yagni.

---
 railties/test/application/assets_test.rb | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index fb570d8f47..85320ccba5 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -106,16 +106,6 @@ module ApplicationTests
       assert !File.exists?("#{app_path}/public/assets/something.min.css")
     end
 
-    test "precompile sets flag notifying rails its precompiling" do
-      add_to_config = <<-RUBY
-        initializer :check_assets_precompile, :group => :assets do
-          raise "ENV RAILS_ASSETS_PRECOMPILE not set" unless ENV["RAILS_ASSETS_PRECOMPILE"]
-        end
-      RUBY
-      precompile!
-      assert $?.success?
-    end
-
     test "asset pipeline should use a Sprockets::Index when config.assets.digest is true" do
       add_to_config "config.assets.digest = true"
       add_to_config "config.action_controller.perform_caching = false"
-- 
cgit v1.2.3


From e69011521da0a9d4559436da21ea030465e54d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Sep 2011 03:05:36 +0200
Subject: Avoid using pathnames and automatically create the manifest directory
 if one does not exist yet.

---
 railties/test/application/assets_test.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 85320ccba5..e9985fa643 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -123,7 +123,6 @@ module ApplicationTests
       add_to_config "config.assets.digest = true"
 
       precompile!
-
       manifest = "#{app_path}/public/assets/manifest.yml"
 
       assets = YAML.load_file(manifest)
@@ -137,10 +136,8 @@ module ApplicationTests
       # digest is default in false, we must enable it for test environment
       add_to_config "config.assets.digest = true"
       add_to_config "config.assets.manifest = '#{app_path}/shared'"
-      FileUtils.mkdir "#{app_path}/shared"
 
       precompile!
-
       manifest = "#{app_path}/shared/manifest.yml"
 
       assets = YAML.load_file(manifest)
@@ -148,7 +145,6 @@ module ApplicationTests
       assert_match(/application-([0-z]+)\.css/, assets["application.css"])
     end
 
-
     test "the manifest file should be saved by default in the same assets folder" do
       app_file "app/assets/javascripts/application.js", "alert();"
       # digest is default in false, we must enable it for test environment
-- 
cgit v1.2.3


From 17882d2a9e8e93a5f6dbe2278deb73269fff30c9 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 26 Sep 2011 13:50:20 -0300
Subject: Copy assets to nondigested filenames too

---
 railties/test/application/assets_test.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index e9985fa643..12466a3296 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -63,7 +63,9 @@ module ApplicationTests
       precompile!
 
       files = Dir["#{app_path}/public/assets/application-*.js"]
+      files << Dir["#{app_path}/public/assets/application.js"].first
       files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
+      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()", File.read(file)
-- 
cgit v1.2.3


From cf90181d8409909803a8325f33e04b5dbdcd6ada Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 26 Sep 2011 09:56:38 -0700
Subject: Merge pull request #3136 from
 guilleiguaran/clear-digests-on-precompile

Avoid use of existing precompiled assets during rake assets:precompile run
---
 railties/test/application/assets_test.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 12466a3296..118ffff44b 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -256,6 +256,24 @@ module ApplicationTests
       assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file))
     end
 
+    test "precompile shouldn't use the digests present in manifest.yml" do
+      app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
+
+      ENV["RAILS_ENV"] = "production"
+      precompile!
+
+      manifest = "#{app_path}/public/assets/manifest.yml"
+      assets = YAML.load_file(manifest)
+      asset_path = assets["application.css"]
+
+      app_file "app/assets/images/rails.png", "image changed"
+
+      precompile!
+      assets = YAML.load_file(manifest)
+
+      assert_not_equal asset_path, assets["application.css"]
+    end
+
     test "precompile appends the md5 hash to files referenced with asset_path and run in production as default even using RAILS_GROUPS=assets" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       add_to_config "config.assets.compile = true"
-- 
cgit v1.2.3


From 753424079e497d8ab7bc611093a34194200e3c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 2 Oct 2011 12:14:31 +0200
Subject: Provide initialize_on_precompile which, when set to false, does not
 initialize the app for precompilation. Defaults to true.

---
 railties/test/application/assets_test.rb | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 118ffff44b..7bace25fef 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -395,7 +395,30 @@ module ApplicationTests
       assert_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body)
     end
 
+    test "assets can access model information when precompiling" do
+      app_file "app/models/post.rb", "class Post; end"
+      app_file "app/assets/javascripts/application.js", "//= require_tree ."
+      app_file "app/assets/javascripts/xmlhr.js.erb", "<%= Post.name %>"
+
+      add_to_config "config.assets.digest = false"
+      precompile!
+      assert_equal "Post;\n", File.read("#{app_path}/public/assets/application.js")
+    end
+
+    test "assets can't access model information when precompiling if not initializing the app" do
+      app_file "app/models/post.rb", "class Post; end"
+      app_file "app/assets/javascripts/application.js", "//= require_tree ."
+      app_file "app/assets/javascripts/xmlhr.js.erb", "<%= defined?(Post) || :NoPost %>"
+
+      add_to_config "config.assets.digest = false"
+      add_to_config "config.assets.initialize_on_precompile = false"
+
+      precompile!
+      assert_equal "NoPost;\n", File.read("#{app_path}/public/assets/application.js")
+    end
+
     private
+
     def app_with_assets_in_view
       app_file "app/assets/javascripts/application.js", "//= require_tree ."
       app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
-- 
cgit v1.2.3


From 9b34e311556fd51f01fda9e5f237969c200125a2 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sun, 2 Oct 2011 13:52:29 -0200
Subject: capture was commented out

---
 railties/test/application/assets_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 7bace25fef..01fe8eeafd 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -249,9 +249,9 @@ module ApplicationTests
       # digest is default in false, we must enable it for test environment
       add_to_config "config.assets.digest = true"
 
-      # capture(:stdout) do
+      capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
-      # end
+      end
       file = Dir["#{app_path}/public/assets/application-*.css"].first
       assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file))
     end
-- 
cgit v1.2.3


From c1547fcf6d3920e81a56ed032c49ab75faf562d8 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sun, 2 Oct 2011 13:57:29 -0200
Subject: Precompile properly refers files referenced with asset_path test

---
 railties/test/application/assets_test.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 01fe8eeafd..ba59d3faa7 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -244,7 +244,7 @@ module ApplicationTests
       assert_match(/app.js isn't precompiled/, last_response.body)
     end
 
-    test "precompile appends the md5 hash to files referenced with asset_path and run in the provided RAILS_ENV" do
+    test "precompile properly refers files referenced with asset_path and and run in the provided RAILS_ENV" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       # digest is default in false, we must enable it for test environment
       add_to_config "config.assets.digest = true"
@@ -252,6 +252,8 @@ module ApplicationTests
       capture(:stdout) do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
       end
+      file = Dir["#{app_path}/public/assets/application.css"].first
+      assert_match(/\/assets\/rails\.png/, File.read(file))
       file = Dir["#{app_path}/public/assets/application-*.css"].first
       assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file))
     end
-- 
cgit v1.2.3


From 0e1f7e0058bc06d9a9356f5b2a1e06447c024f46 Mon Sep 17 00:00:00 2001
From: Sam Pohlenz <sam@sampohlenz.com>
Date: Mon, 3 Oct 2011 16:05:05 +1030
Subject: Replace calls to capture(:stdout) with quietly in assets tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/test/application/assets_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index ba59d3faa7..d0713620bd 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -22,7 +22,7 @@ module ApplicationTests
     end
 
     def precompile!
-      capture(:stdout) do
+      quietly do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
       end
     end
@@ -249,7 +249,7 @@ module ApplicationTests
       # digest is default in false, we must enable it for test environment
       add_to_config "config.assets.digest = true"
 
-      capture(:stdout) do
+      quietly do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
       end
       file = Dir["#{app_path}/public/assets/application.css"].first
@@ -281,7 +281,7 @@ module ApplicationTests
       add_to_config "config.assets.compile = true"
 
       ENV["RAILS_ENV"] = nil
-      capture(:stdout) do
+      quietly do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_GROUPS=assets` }
       end
       file = Dir["#{app_path}/public/assets/application-*.css"].first
@@ -306,7 +306,7 @@ module ApplicationTests
       app_file "public/assets/application.css", "a { color: green; }"
       app_file "public/assets/subdir/broken.png", "not really an image file"
 
-      capture(:stdout) do
+      quietly do
         Dir.chdir(app_path){ `bundle exec rake assets:clean` }
       end
 
-- 
cgit v1.2.3


From 6f429f375e43529f2dd1a2f37cbaabeef40c6ea9 Mon Sep 17 00:00:00 2001
From: Sam Pohlenz <sam@sampohlenz.com>
Date: Mon, 3 Oct 2011 16:06:04 +1030
Subject: Ensure that enhancements to assets:precompile task are only run once
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/test/application/assets_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index d0713620bd..6fd8808aaa 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -419,6 +419,12 @@ module ApplicationTests
       assert_equal "NoPost;\n", File.read("#{app_path}/public/assets/application.js")
     end
 
+    test "enhancements to assets:precompile should only run once" do
+      app_file "lib/tasks/enhance.rake", "Rake::Task['assets:precompile'].enhance { puts 'enhancement' }"
+      output = precompile!
+      assert_equal 1, output.scan("enhancement").size
+    end
+
     private
 
     def app_with_assets_in_view
-- 
cgit v1.2.3


From a7648c213d17f1a58a022fb220efe6310e3f56c3 Mon Sep 17 00:00:00 2001
From: "Mark J. Titorenko" <mark@titorenko.net>
Date: Mon, 3 Oct 2011 13:42:50 +0100
Subject: add failing test for #3198
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/test/application/assets_test.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 6fd8808aaa..e0e36063c8 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -425,6 +425,19 @@ module ApplicationTests
       assert_equal 1, output.scan("enhancement").size
     end
 
+    test "digested assets are not mistakenly removed" do
+      app_file "public/assets/application.js", "alert();"
+      add_to_config "config.assets.compile = true"
+      add_to_config "config.assets.digest = true"
+
+      quietly do
+        Dir.chdir(app_path){ `bundle exec rake assets:clean assets:precompile` }
+      end
+
+      files = Dir["#{app_path}/public/assets/application-*.js"]
+      assert_equal 1, files.length, "Expected digested application.js asset to be generated, but none found"
+    end
+
     private
 
     def app_with_assets_in_view
-- 
cgit v1.2.3


From 7f1a666db57983814e175cb5b54bb6621ec95c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 4 Oct 2011 11:24:12 +0200
Subject: Fix failing tests and refactor assets.rake

---
 railties/test/application/assets_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index e0e36063c8..efbed35bdf 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -247,7 +247,7 @@ module ApplicationTests
     test "precompile properly refers files referenced with asset_path and and run in the provided RAILS_ENV" do
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
       # digest is default in false, we must enable it for test environment
-      add_to_config "config.assets.digest = true"
+      add_to_env_config "test", "config.assets.digest = true"
 
       quietly do
         Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
-- 
cgit v1.2.3


From 1f0b78e045f005fee96c11be150549d6092a2177 Mon Sep 17 00:00:00 2001
From: "Mark J. Titorenko" <mark@titorenko.net>
Date: Tue, 4 Oct 2011 19:02:06 +0100
Subject: add failing test: "digested assets are removed from configured path"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/test/application/assets_test.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index efbed35bdf..b0748c7572 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -438,6 +438,19 @@ module ApplicationTests
       assert_equal 1, files.length, "Expected digested application.js asset to be generated, but none found"
     end
 
+    test "digested assets are removed from configured path" do
+      app_file "public/production_assets/application.js", "alert();"
+      add_to_env_config "production", "config.assets.prefix = 'production_assets'"
+
+      ENV["RAILS_ENV"] = nil
+      quietly do
+        Dir.chdir(app_path){ `bundle exec rake assets:clean` }
+      end
+
+      files = Dir["#{app_path}/public/production_assets/application.js"]
+      assert_equal 0, files.length, "Expected application.js asset to be removed, but still exists"
+    end
+
     private
 
     def app_with_assets_in_view
-- 
cgit v1.2.3


From 9c69ef31676b8d0c7a54313b4c53aa7279b6f516 Mon Sep 17 00:00:00 2001
From: "Mark J. Titorenko" <mark@titorenko.net>
Date: Tue, 4 Oct 2011 19:02:28 +0100
Subject: correct path used in "digested assets are not mistakenly removed"
 test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/test/application/assets_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index b0748c7572..e38ea30c30 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -426,7 +426,7 @@ module ApplicationTests
     end
 
     test "digested assets are not mistakenly removed" do
-      app_file "public/assets/application.js", "alert();"
+      app_file "app/assets/application.js", "alert();"
       add_to_config "config.assets.compile = true"
       add_to_config "config.assets.digest = true"
 
-- 
cgit v1.2.3


From 4cea4ee6b54fee897b984a3c0288d12ce2d1efe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 5 Oct 2011 09:35:27 +0200
Subject: Fix regression when calling helpers inside sprockets.

---
 railties/test/application/assets_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index e38ea30c30..63427c7792 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -28,7 +28,7 @@ module ApplicationTests
     end
 
     test "assets routes have higher priority" do
-      app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
+      app_file "app/assets/javascripts/demo.js.erb", "a = <%= image_path('rails.png').inspect %>;"
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
@@ -39,7 +39,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
 
       get "/assets/demo.js"
-      assert_match "alert()", last_response.body
+      assert_equal 'a = "/assets/rails.png";', last_response.body.strip
     end
 
     test "assets do not require compressors until it is used" do
-- 
cgit v1.2.3


From 9ce03d15428fee6f63e72a3de7b60f5e1ab8a97a Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 8 Oct 2011 12:56:06 -0700
Subject: Skip broken asset precompilation test on Macs. Issues with NFD vs NFC
 normalization on the asset filename. Major red flag with asset lookups!

---
 railties/test/application/assets_test.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 63427c7792..3a8add3d3e 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -289,16 +289,20 @@ module ApplicationTests
     end
 
     test "precompile should handle utf8 filenames" do
-      app_file "app/assets/images/レイルズ.png", "not a image really"
+      if `uname` =~ /Darwin/
+        skip 'Asset lookup with Unicode filenames is a problematic due to different normalization forms. Mac uses NKD for filenames; Windows and Linux use NFC. So your asset lookups may mysteriously fail. Sprockets should handle these platform issues transparently.'
+      end
+
+      filename = "レイルズ.png"
+      app_file "app/assets/images/#{filename}", "not a image really"
       add_to_config "config.assets.precompile = [ /\.png$$/, /application.(css|js)$/ ]"
 
       precompile!
-      assert File.exists?("#{app_path}/public/assets/レイルズ.png")
+      assert File.exists?("#{app_path}/public/assets/#{filename}")
 
       manifest = "#{app_path}/public/assets/manifest.yml"
-
       assets = YAML.load_file(manifest)
-      assert_equal "レイルズ.png", assets["レイルズ.png"]
+      assert_equal filename, assets[filename], assets.inspect
     end
 
     test "assets are cleaned up properly" do
-- 
cgit v1.2.3


From b111b41d131fd5d90d88052bb6e95676c29a9d8d Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 8 Oct 2011 15:24:52 -0500
Subject: Test utf8 assets filenames with request instead of manifest lookup

---
 railties/test/application/assets_test.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 3a8add3d3e..2c9ebbf327 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -289,20 +289,16 @@ module ApplicationTests
     end
 
     test "precompile should handle utf8 filenames" do
-      if `uname` =~ /Darwin/
-        skip 'Asset lookup with Unicode filenames is a problematic due to different normalization forms. Mac uses NKD for filenames; Windows and Linux use NFC. So your asset lookups may mysteriously fail. Sprockets should handle these platform issues transparently.'
-      end
-
       filename = "レイルズ.png"
       app_file "app/assets/images/#{filename}", "not a image really"
       add_to_config "config.assets.precompile = [ /\.png$$/, /application.(css|js)$/ ]"
 
       precompile!
-      assert File.exists?("#{app_path}/public/assets/#{filename}")
+      require "#{app_path}/config/environment"
 
-      manifest = "#{app_path}/public/assets/manifest.yml"
-      assets = YAML.load_file(manifest)
-      assert_equal filename, assets[filename], assets.inspect
+      get "/assets/#{URI.escape(filename)}"
+      assert_match "not a image really", last_response.body
+      assert File.exists?("#{app_path}/public/assets/#{filename}")
     end
 
     test "assets are cleaned up properly" do
-- 
cgit v1.2.3


From 2886513aea90257d69c02bf77a50884a5b2ba82b Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sun, 9 Oct 2011 15:27:35 +0530
Subject: URI.escape is obsolete : warning removed

---
 railties/test/application/assets_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 2c9ebbf327..2710498fd0 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -296,7 +296,7 @@ module ApplicationTests
       precompile!
       require "#{app_path}/config/environment"
 
-      get "/assets/#{URI.escape(filename)}"
+      get "/assets/#{URI.parser.escape(filename)}"
       assert_match "not a image really", last_response.body
       assert File.exists?("#{app_path}/public/assets/#{filename}")
     end
-- 
cgit v1.2.3


From 6d05597d0f03030a429d8154daf99a1226e6cbbd Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Mon, 10 Oct 2011 01:54:54 +0900
Subject: fix invalid regex

---
 railties/test/application/assets_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 2c9ebbf327..d4168ac090 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -291,7 +291,7 @@ module ApplicationTests
     test "precompile should handle utf8 filenames" do
       filename = "レイルズ.png"
       app_file "app/assets/images/#{filename}", "not a image really"
-      add_to_config "config.assets.precompile = [ /\.png$$/, /application.(css|js)$/ ]"
+      add_to_config "config.assets.precompile = [ /\.png$/, /application.(css|js)$/ ]"
 
       precompile!
       require "#{app_path}/config/environment"
-- 
cgit v1.2.3


From 88237daae48c9867fca3b0e14e779d4f4cdd88d0 Mon Sep 17 00:00:00 2001
From: Jonathan del Strother <jon.delStrother@audioboo.fm>
Date: Thu, 17 Nov 2011 11:48:12 +0000
Subject: Leave default_asset_host_protocol unset

When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation)
---
 railties/test/application/assets_test.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'railties/test/application/assets_test.rb')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index d4ffbe3d66..a22013f81c 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -451,6 +451,28 @@ module ApplicationTests
       assert_equal 0, files.length, "Expected application.js asset to be removed, but still exists"
     end
 
+    test "asset urls should use the request's protocol by default" do
+      app_with_assets_in_view
+      add_to_config "config.asset_host = 'example.com'"
+      require "#{app_path}/config/environment"
+      class ::PostsController < ActionController::Base; end
+
+      get '/posts', {}, {'HTTPS'=>'off'}
+      assert_match('src="http://example.com/assets/application.js', last_response.body)
+      get '/posts', {}, {'HTTPS'=>'on'}
+      assert_match('src="https://example.com/assets/application.js', last_response.body)
+    end
+
+    test "asset urls should be protocol-relative if no request is in scope" do
+      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.asset_host = 'example.com'"
+      precompile!
+
+      assert_match 'src="//example.com/assets/rails.png"', File.read("#{app_path}/public/assets/image_loader.js")
+    end
+
+
     private
 
     def app_with_assets_in_view
-- 
cgit v1.2.3