aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-10 14:15:09 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-10 14:15:09 -0700
commitb2063f2a7aef211bed5d2014ec655b272739287f (patch)
tree86c817a1f9ed59a8f9ef897dc6a58ccb0a44283e
parent416884c36d1eb2f0a607ba9a54dbe39773a92f6e (diff)
parent551066633d83939b1077eef38c3e2d449b230849 (diff)
downloadrails-b2063f2a7aef211bed5d2014ec655b272739287f.tar.gz
rails-b2063f2a7aef211bed5d2014ec655b272739287f.tar.bz2
rails-b2063f2a7aef211bed5d2014ec655b272739287f.zip
Merge pull request #7586 from route/precompile-should-not-fail-quietly
Rake assets:precompile shouldn't fail quietly.
-rw-r--r--railties/test/application/assets_test.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 9c402fab02..841828e634 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -19,13 +19,10 @@ module ApplicationTests
def precompile!(env = nil)
quietly do
- precompile_task = 'bundle exec rake assets:precompile'
- precompile_task += ' ' + env if env
- out = Dir.chdir(app_path){ %x[ #{precompile_task} ] }
- assert $?.exitstatus == 0,
- "#{precompile_task} has failed: #{out}.\
- Probably you didn't install JavaScript runtime."
- return out
+ precompile_task = "bundle exec rake assets:precompile #{env} 2>&1"
+ output = Dir.chdir(app_path) { %x[ #{precompile_task} ] }
+ assert $?.success?, output
+ output
end
end