From fc133d86657f4c73cd0f2035e95f0b54485be86b Mon Sep 17 00:00:00 2001 From: Gani Georgiev Date: Mon, 11 Nov 2024 14:25:21 +0200 Subject: [PATCH] fixed settings test and error typo --- core/settings_model.go | 2 +- core/settings_model_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/settings_model.go b/core/settings_model.go index 64c62161..81c145bd 100644 --- a/core/settings_model.go +++ b/core/settings_model.go @@ -633,7 +633,7 @@ func checkUniqueRuleLabel(value any) error { if conflicts { return validation.Errors{ strconv.Itoa(i): validation.Errors{ - "label": validation.NewError("validation_conflcting_rate_limit_rule", "Rate limit rule configuration with label "+rule.Label+" already exists or conflicts with another rule."). + "label": validation.NewError("validation_conflicting_rate_limit_rule", "Rate limit rule configuration with label "+rule.Label+" already exists or conflicts with another rule."). SetParams(map[string]any{"label": rule.Label}), }, } diff --git a/core/settings_model_test.go b/core/settings_model_test.go index 4e75ad66..51800d8a 100644 --- a/core/settings_model_test.go +++ b/core/settings_model_test.go @@ -106,7 +106,7 @@ func TestSettingsMarshalJSON(t *testing.T) { } rawStr := string(raw) - expected := `{"smtp":{"enabled":false,"port":0,"host":"","username":"abc","authMethod":"","tls":false,"localName":""},"backups":{"cron":"","cronMaxKeep":0,"s3":{"enabled":false,"bucket":"","region":"","endpoint":"","accessKey":"","forcePathStyle":false}},"s3":{"enabled":false,"bucket":"","region":"","endpoint":"","accessKey":"","forcePathStyle":false},"meta":{"appName":"test123","appURL":"","senderName":"","senderAddress":"","hideControls":false},"logs":{"maxDays":0,"minLevel":0,"logIP":false,"logAuthId":false},"batch":{"enabled":false,"maxRequests":0,"timeout":0,"maxBodySize":0},"rateLimits":{"rules":[],"enabled":false},"trustedProxy":{"headers":[],"useLeftmostIP":false}}` + expected := `{"smtp":{"enabled":false,"port":0,"host":"","username":"abc","authMethod":"","tls":false,"localName":""},"backups":{"cron":"","cronMaxKeep":0,"s3":{"enabled":false,"bucket":"","region":"","endpoint":"","accessKey":"","forcePathStyle":false}},"s3":{"enabled":false,"bucket":"","region":"","endpoint":"","accessKey":"","forcePathStyle":false},"meta":{"appName":"test123","appURL":"","senderName":"","senderAddress":"","hideControls":false},"rateLimits":{"rules":[],"enabled":false},"trustedProxy":{"headers":[],"useLeftmostIP":false},"batch":{"enabled":false,"maxRequests":0,"timeout":0,"maxBodySize":0},"logs":{"maxDays":0,"minLevel":0,"logIP":false,"logAuthId":false}}` if rawStr != expected { t.Fatalf("Expected\n%v\ngot\n%v", expected, rawStr)