aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/asset_debugging_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test/application/asset_debugging_test.rb')
-rw-r--r--railties/test/application/asset_debugging_test.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index ecacb34cb2..1eddfac664 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -7,7 +7,7 @@ module ApplicationTests
include Rack::Test::Methods
def setup
- build_app(:initializers => true)
+ build_app(initializers: true)
app_file "app/assets/javascripts/application.js", "//= require_tree ."
app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
@@ -15,7 +15,7 @@ module ApplicationTests
app_file "config/routes.rb", <<-RUBY
AppTemplate::Application.routes.draw do
- get '/posts', :to => "posts#index"
+ get '/posts', to: "posts#index"
end
RUBY
@@ -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
@@ -50,7 +49,7 @@ module ApplicationTests
end
test "assets aren't concatened when compile is true is on and debug_assets params is true" do
- 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"