From 13da5c38b1e4105dae2654e50767fc94b0158006 Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:17:21 +0200 Subject: [PATCH] Make Sytest happy again --- internal/pushrules/validate.go | 3 +++ internal/pushrules/validate_test.go | 1 + 2 files changed, 4 insertions(+) diff --git a/internal/pushrules/validate.go b/internal/pushrules/validate.go index 19ba6550b..4cc479345 100644 --- a/internal/pushrules/validate.go +++ b/internal/pushrules/validate.go @@ -18,6 +18,9 @@ func ValidateRule(kind Kind, rule *Rule) []error { errs = append(errs, fmt.Errorf("invalid rule ID: %s", rule.RuleID)) } + if rule.Actions == nil { + errs = append(errs, fmt.Errorf("missing actions")) + } for _, action := range rule.Actions { errs = append(errs, validateAction(action)...) } diff --git a/internal/pushrules/validate_test.go b/internal/pushrules/validate_test.go index 23fa66b88..966e46259 100644 --- a/internal/pushrules/validate_test.go +++ b/internal/pushrules/validate_test.go @@ -15,6 +15,7 @@ func TestValidateRuleNegatives(t *testing.T) { {Name: "emptyRuleID", Kind: OverrideKind, Rule: Rule{}, WantErrString: "invalid rule ID"}, {Name: "invalidKind", Kind: Kind("something else"), Rule: Rule{}, WantErrString: "invalid rule kind"}, {Name: "ruleIDBackslash", Kind: OverrideKind, Rule: Rule{RuleID: "#foo\\:example.com"}, WantErrString: "invalid rule ID"}, + {Name: "noActions", Kind: OverrideKind, Rule: Rule{}, WantErrString: "missing actions"}, {Name: "invalidAction", Kind: OverrideKind, Rule: Rule{Actions: []*Action{{}}}, WantErrString: "invalid rule action kind"}, {Name: "invalidCondition", Kind: OverrideKind, Rule: Rule{Conditions: []*Condition{{}}}, WantErrString: "invalid rule condition kind"}, {Name: "overrideNoCondition", Kind: OverrideKind, Rule: Rule{}, WantErrString: "missing rule conditions"},