diff options
author | Daniel Schierbeck <daniel.schierbeck@gmail.com> | 2011-08-25 11:40:10 +0200 |
---|---|---|
committer | Daniel Schierbeck <daniel.schierbeck@gmail.com> | 2011-08-25 11:57:16 +0200 |
commit | 372892eaeadb8174fcca6c955b46890da2a07abc (patch) | |
tree | f07fcccedc6fe5b70ef4c1afd0f5346fca06fa4e /railties/test/application/assets_test.rb | |
parent | 68424fb1cf45acda3ad1daef30136f3bcd4f9f9d (diff) | |
download | rails-372892eaeadb8174fcca6c955b46890da2a07abc.tar.gz rails-372892eaeadb8174fcca6c955b46890da2a07abc.tar.bz2 rails-372892eaeadb8174fcca6c955b46890da2a07abc.zip |
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.
Diffstat (limited to 'railties/test/application/assets_test.rb')
-rw-r--r-- | railties/test/application/assets_test.rb | 42 |
1 files changed, 0 insertions, 42 deletions
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 |