tpl: Update upper to accept interface{} params

Updates #2822

diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
index 7d72a587ee63be007af233eb0f75dec354d37060..aba536a3994cd1b8b377ad7db3349ceb19d77dfe 100644 (file)
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -1457,6 +1457,17 @@ func lower(s interface{}) (string, error) {
        return strings.ToLower(ss), nil
 }
 
+// upper returns a copy of the input s with all Unicode letters mapped to their
+// upper case.
+func upper(s interface{}) (string, error) {
+       ss, err := cast.ToStringE(s)
+       if err != nil {
+               return "", err
+       }
+
+       return strings.ToUpper(ss), nil
+}
+
 // trim leading/trailing characters defined by b from a
 func trim(a interface{}, b string) (string, error) {
        aStr, err := cast.ToStringE(a)
@@ -2150,7 +2161,7 @@ func initFuncMap() {
                "title":        func(a string) string { return strings.Title(a) },
                "time":         asTime,
                "trim":         trim,
-               "upper":        func(a string) string { return strings.ToUpper(a) },
+               "upper":        upper,
                "urlize":       helpers.CurrentPathSpec().URLize,
                "where":        where,
                "i18n":         i18nTranslate,

diff --git a/tpl/template_funcs_test.go b/tpl/template_funcs_test.go
index e2ac80e575a80131ec9b1a67529d9ec3763dfe44..0b583c306ebdc4c39ae01536a3f252d9c3cd2567 100644 (file)
--- a/tpl/template_funcs_test.go
+++ b/tpl/template_funcs_test.go
@@ -2022,6 +2022,29 @@ func TestLower(t *testing.T) {
        }
 }
 
+func TestUpper(t *testing.T) {
+       cases := []struct {
+               s     interface{}
+               want  string
+               isErr bool
+       }{
+               {"test", "TEST", false},
+               {template.HTML("UpPeR"), "UPPER", false},
+               {[]byte("bytes"), "BYTES", false},
+       }
+
+       for i, c := range cases {
+               res, err := upper(c.s)
+               if (err != nil) != c.isErr {
+                       t.Fatalf("[%d] unexpected isErr state: want %v, got %v, err = %v", i, c.want, (err != nil), err)
+               }
+
+               if res != c.want {
+                       t.Errorf("[%d] upper failed: want %v, got %v", i, c.want, res)
+               }
+       }
+}
+
 func TestHighlight(t *testing.T) {
        code := "func boo() {}"
        highlighted, err := highlight(code, "go", "")