diff options
| author | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:01:04 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:01:04 -0300 |
| commit | 8ee0b4414890f919594c1a388d987b5b7364a505 (patch) | |
| tree | 6c6c6aa19da0eb8066d2f0b9b02b08f2cc696c29 /actionpack/test/template/html-scanner | |
| parent | 348c0ec7c656b3691aa4e687565d28259ca0f693 (diff) | |
| parent | c9f1ab5365319e087e1b010a3f90626a2b8f080b (diff) | |
| download | rails-8ee0b4414890f919594c1a388d987b5b7364a505.tar.gz rails-8ee0b4414890f919594c1a388d987b5b7364a505.tar.bz2 rails-8ee0b4414890f919594c1a388d987b5b7364a505.zip | |
Merge remote branch 'rails/master' into identity_map
Conflicts:
activerecord/examples/performance.rb
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/autosave_association.rb
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/nested_attributes.rb
activerecord/test/cases/relations_test.rb
Diffstat (limited to 'actionpack/test/template/html-scanner')
| -rw-r--r-- | actionpack/test/template/html-scanner/sanitizer_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/test/template/html-scanner/sanitizer_test.rb b/actionpack/test/template/html-scanner/sanitizer_test.rb index 3e80317b30..fcc3782f04 100644 --- a/actionpack/test/template/html-scanner/sanitizer_test.rb +++ b/actionpack/test/template/html-scanner/sanitizer_test.rb @@ -130,6 +130,13 @@ class SanitizerTest < ActionController::TestCase assert sanitizer.send(:contains_bad_protocols?, 'src', "#{proto}://bad") end end + + def test_should_accept_good_protocols_ignoring_case + sanitizer = HTML::WhiteListSanitizer.new + HTML::WhiteListSanitizer.allowed_protocols.each do |proto| + assert !sanitizer.send(:contains_bad_protocols?, 'src', "#{proto.capitalize}://good") + end + end def test_should_accept_good_protocols sanitizer = HTML::WhiteListSanitizer.new |