From 2a5f6d8fe6898f2570ba66382336d56894a43322 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 12 Nov 2012 18:17:06 -0800
Subject: Ruby 2.0.0 defaults source encoding to utf-8 so we need to
 specifically tag this file with us-ascii

---
 actionpack/test/template/template_test.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 56943381d8..b7f785fe3a 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -1,3 +1,4 @@
+# encoding: US-ASCII
 require "abstract_unit"
 require "logger"
 
-- 
cgit v1.2.3


From 42d7927c22a2c219d6145d9375be65a04a83dce3 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 6 Oct 2012 21:06:10 -0700
Subject: Ruby 2 compat. CGI.escapeHTML has changed the way it escapes
 apostrophes a few times, so fix up the test to work with however it chooses
 to escape.

---
 actionpack/test/template/html-scanner/sanitizer_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/html-scanner/sanitizer_test.rb b/actionpack/test/template/html-scanner/sanitizer_test.rb
index 62ad6be680..844484ee47 100644
--- a/actionpack/test/template/html-scanner/sanitizer_test.rb
+++ b/actionpack/test/template/html-scanner/sanitizer_test.rb
@@ -210,7 +210,7 @@ class SanitizerTest < ActionController::TestCase
 
   # TODO: Clean up
   def test_should_sanitize_attributes
-    assert_sanitized %(<SPAN title="'><script>alert()</script>">blah</SPAN>), %(<span title="'&gt;&lt;script&gt;alert()&lt;/script&gt;">blah</span>)
+    assert_sanitized %(<SPAN title="'><script>alert()</script>">blah</SPAN>), %(<span title="#{CGI.escapeHTML "'><script>alert()</script>"}">blah</span>)
   end
 
   def test_should_sanitize_illegal_style_properties
-- 
cgit v1.2.3