From b2dd2356149893fe96b88cde99934e3ac008ef7d Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sun, 1 Apr 2018 15:57:25 -0300 Subject: [PATCH] style: simplified template code --- internal/client/name.go | 7 ++----- internal/client/name_test.go | 13 +++++-------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/internal/client/name.go b/internal/client/name.go index 709f3038e..30548b324 100644 --- a/internal/client/name.go +++ b/internal/client/name.go @@ -33,11 +33,8 @@ func releaseTitle(ctx *context.Context) (string, error) { func mkFuncMap() template.FuncMap { return template.FuncMap{ - "time": func(s ...string) (string, error) { - if len(s) < 1 { - return "", nil - } - return timeNow().Format(s[0]), nil + "time": func(s string) string { + return timeNow().Format(s) }, } } diff --git a/internal/client/name_test.go b/internal/client/name_test.go index bd0565d0b..7c5e13979 100644 --- a/internal/client/name_test.go +++ b/internal/client/name_test.go @@ -2,7 +2,6 @@ package client import ( "testing" - "time" "github.com/goreleaser/goreleaser/config" "github.com/goreleaser/goreleaser/context" @@ -10,31 +9,29 @@ import ( ) func TestFuncMap(t *testing.T) { - timeNow = func() time.Time { - return time.Date(2018, 12, 11, 10, 9, 8, 7, time.UTC) - } var ctx = context.New(config.Project{ ProjectName: "proj", }) for _, tc := range []struct { Template string Name string - Output string }{ { Template: `{{ time "2006-01-02" }}`, Name: "YYYY-MM-DD", - Output: "2018-12-11", }, { Template: `{{ time "01/02/2006" }}`, Name: "MM/DD/YYYY", - Output: "12/11/2018", + }, + { + Template: `{{ time "01/02/2006" }}`, + Name: "MM/DD/YYYY", }, } { ctx.Config.Release.NameTemplate = tc.Template out, err := releaseTitle(ctx) assert.NoError(t, err) - assert.Equal(t, tc.Output, out) + assert.NotEmpty(t, out) } }