diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-25 19:12:24 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-25 19:12:24 -0700 |
| commit | e3a020a679acc732c0e57ada597c3c4043b96aa1 (patch) | |
| tree | 3e963c5e5989ffc2b5cb3c5b8e2577054ee9ff88 | |
| parent | 42a7979cf1810c75343b18007858b81718b90678 (diff) | |
| parent | a071c9b6679136217fc30ca69317d9a975d6714c (diff) | |
| download | rails-e3a020a679acc732c0e57ada597c3c4043b96aa1.tar.gz rails-e3a020a679acc732c0e57ada597c3c4043b96aa1.tar.bz2 rails-e3a020a679acc732c0e57ada597c3c4043b96aa1.zip | |
Merge pull request #2699 from guilleiguaran/fix-asset-debugging-test-1.8
Fix failing asset debug test under 1.8
| -rw-r--r-- | railties/test/application/asset_debugging_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb index 0be591a1b9..38e1e21d17 100644 --- a/railties/test/application/asset_debugging_test.rb +++ b/railties/test/application/asset_debugging_test.rb @@ -40,7 +40,7 @@ module ApplicationTests # the debug_assets params isn't used if allow_debugging is off get '/posts?debug_assets=true' assert_match %r{<script src="/assets/application-([0-z]+)\.js" type="text/javascript"></script>}, last_response.body - assert_not_match %r{<script src="/assets/xmlhr-([0-z]+)\.js" type="text/javascript"></script>}, last_response.body + assert_no_match %r{<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 |