aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-12 20:44:32 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-12 20:44:32 -0700
commit1dc2ea8f3dfc1cce1958bd661c641ed345adf910 (patch)
tree8ae388d2b5a71b2781c9a6020ce1b32fbdd652b7 /railties/test
parent775829869e23666e114edbe8d6d3ff08d5d71025 (diff)
downloadrails-1dc2ea8f3dfc1cce1958bd661c641ed345adf910.tar.gz
rails-1dc2ea8f3dfc1cce1958bd661c641ed345adf910.tar.bz2
rails-1dc2ea8f3dfc1cce1958bd661c641ed345adf910.zip
Tighten up asset precompile tests
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/asset_debugging_test.rb5
-rw-r--r--railties/test/application/assets_test.rb2
2 files changed, 3 insertions, 4 deletions
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index ebafc7d670..a7b3ae1e9a 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -36,9 +36,8 @@ module ApplicationTests
test "assets are concatenated when debug is off and compile is off either if debug_assets param is provided" do
# config.assets.debug and config.assets.compile are false for production environment
ENV["RAILS_ENV"] = "production"
- capture(:stdout) do
- Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
- end
+ output = Dir.chdir(app_path){ `bundle exec rake assets:precompile --trace 2>&1` }
+ assert $?.success?, output
require "#{app_path}/config/environment"
class ::PostsController < ActionController::Base ; end
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index be97855e1a..8a76b2f614 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -18,7 +18,7 @@ module ApplicationTests
def precompile!(env = nil)
quietly do
- precompile_task = "bundle exec rake assets:precompile #{env} 2>&1"
+ precompile_task = "bundle exec rake assets:precompile #{env} --trace 2>&1"
output = Dir.chdir(app_path) { %x[ #{precompile_task} ] }
assert $?.success?, output
output