Merge pull request #25 from 18F/joeschanges

Joeschanges

src/main.go

@@ -16,9 +16,14 @@ func init() {
 }
 
 func helloHtml(path string) string {
+	no_foo := convertFoo(path)
+	return fmt.Sprintf("<h1>Salutations AMPD from Go,</h1>\n<p>You've requested: %s</p>\n", html.EscapeString(no_foo))
+}
+
+func convertFoo(path string) string {
 	re := regexp.MustCompile(`(?i)foo`)
 	path = re.ReplaceAllString(path, "bar")
-	return fmt.Sprintf("<h1>Salutations AMPD from Go,</h1>\n<p>You've requested: %s</p>\n", html.EscapeString(path))
+	return path
 }
 
 func main() {

src/main_test.go

@@ -54,7 +54,7 @@ func TestJavaScriptInjection(t *testing.T) {
 
 func TestConvertFoo(t *testing.T) {
 	path := "/foo/bar"
-	text := helloHtml(path)
+	text := convertFoo(path)
 	if strings.Contains(text, "foo") {
 		t.Fatal("'foo' in path")
 	}