From 5826221dbab25fb713844028cc764471547e00e1 Mon Sep 17 00:00:00 2001 From: Alexander Belanger Date: Wed, 27 Dec 2023 14:56:59 -0500 Subject: [PATCH] fix validator tests --- internal/validator/validator.go | 2 -- internal/validator/validator_test.go | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/validator/validator.go b/internal/validator/validator.go index cc4443820..2e586cf44 100644 --- a/internal/validator/validator.go +++ b/internal/validator/validator.go @@ -13,8 +13,6 @@ var NameRegex = regexp.MustCompile("^[a-zA-Z0-9\\.\\-_]+$") var CronRegex = regexp.MustCompile(`(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\d+(ns|us|µs|ms|s|m|h))+)|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ?){5,7})`) -// New creates a new instance of validator and sets the tag name -// to "form", instead of "validate" func newValidator() *validator.Validate { validate := validator.New() diff --git a/internal/validator/validator_test.go b/internal/validator/validator_test.go index 26180cd9a..981892d80 100644 --- a/internal/validator/validator_test.go +++ b/internal/validator/validator_test.go @@ -7,18 +7,17 @@ import ( ) type nameResource struct { - DisplayName string `form:"hatchet-name"` + DisplayName string `validate:"hatchetName"` } func TestValidatorInvalidName(t *testing.T) { - t.Skipf("TODO: @abelanger5 fix this test") v := newValidator() err := v.Struct(&nameResource{ DisplayName: "&&!!", }) - assert.ErrorContains(t, err, "validation for 'DisplayName' failed on the 'hatchet-name' tag", "should throw error on invalid name") + assert.ErrorContains(t, err, "validation for 'DisplayName' failed on the 'hatchetName' tag", "should throw error on invalid name") } func TestValidatorValidName(t *testing.T) { @@ -32,7 +31,7 @@ func TestValidatorValidName(t *testing.T) { } type cronResource struct { - Cron string `form:"cron"` + Cron string `validate:"cron"` } func TestValidatorValidCron(t *testing.T) { @@ -46,7 +45,6 @@ func TestValidatorValidCron(t *testing.T) { } func TestValidatorInvalidCron(t *testing.T) { - t.Skipf("TODO: @abelanger5 fix this test") v := newValidator() err := v.Struct(&cronResource{