From: David Symonds <dsymonds@golang.org>
Date: Thu, 1 Mar 2012 06:52:05 +0000 (+1100)
Subject: html/template: encoding/json does more escaping now, so update the html/template... 
X-Git-Tag: weekly.2012-03-04~63
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=289a1638aa2af9b0cd633480c426285a10861c42;p=gostls13.git

html/template: encoding/json does more escaping now, so update the html/template test that uses it.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5714052
---

diff --git a/src/pkg/html/template/escape_test.go b/src/pkg/html/template/escape_test.go
index a92a0596c7..2bbb1b1bc9 100644
--- a/src/pkg/html/template/escape_test.go
+++ b/src/pkg/html/template/escape_test.go
@@ -223,14 +223,14 @@ func TestEscape(t *testing.T) {
 			`<button onclick='alert(&quot;\x3cHello\x3e&quot;)'>`,
 		},
 		{
-			"badMarshaller",
+			"badMarshaler",
 			`<button onclick='alert(1/{{.B}}in numbers)'>`,
 			`<button onclick='alert(1/ /* json: error calling MarshalJSON for type *template.badMarshaler: invalid character &#39;f&#39; looking for beginning of object key string */null in numbers)'>`,
 		},
 		{
-			"jsMarshaller",
+			"jsMarshaler",
 			`<button onclick='alert({{.M}})'>`,
-			`<button onclick='alert({&#34;&lt;foo&gt;&#34;:&#34;O&#39;Reilly&#34;})'>`,
+			`<button onclick='alert({&#34;\u003cfoo\u003e&#34;:&#34;O&#39;Reilly&#34;})'>`,
 		},
 		{
 			"jsStrNotUnderEscaped",