merge v0.23.0-rc changes

forms/test_email_send_test.go

@@ -1,6 +1,7 @@
 package forms_test
 
 import (
+	"fmt"
 	"strings"
 	"testing"
 
@@ -15,43 +16,46 @@ func TestEmailSendValidateAndSubmit(t *testing.T) {
 	scenarios := []struct {
 		template       string
 		email          string
+		collection     string
 		expectedErrors []string
 	}{
-		{"", "", []string{"template", "email"}},
-		{"invalid", "test@example.com", []string{"template"}},
-		{"verification", "invalid", []string{"email"}},
-		{"verification", "test@example.com", nil},
-		{"password-reset", "test@example.com", nil},
-		{"email-change", "test@example.com", nil},
+		{"", "", "", []string{"template", "email"}},
+		{"invalid", "test@example.com", "", []string{"template"}},
+		{forms.TestTemplateVerification, "invalid", "", []string{"email"}},
+		{forms.TestTemplateVerification, "test@example.com", "invalid", []string{"collection"}},
+		{forms.TestTemplateVerification, "test@example.com", "demo1", []string{"collection"}},
+		{forms.TestTemplateVerification, "test@example.com", "users", nil},
+		{forms.TestTemplatePasswordReset, "test@example.com", "", nil},
+		{forms.TestTemplateEmailChange, "test@example.com", "", nil},
+		{forms.TestTemplateOTP, "test@example.com", "", nil},
+		{forms.TestTemplateAuthAlert, "test@example.com", "", nil},
 	}
 
 	for i, s := range scenarios {
-		func() {
+		t.Run(fmt.Sprintf("%d_%s", i, s.template), func(t *testing.T) {
 			app, _ := tests.NewTestApp()
 			defer app.Cleanup()
 
 			form := forms.NewTestEmailSend(app)
 			form.Email = s.email
 			form.Template = s.template
+			form.Collection = s.collection
 
 			result := form.Submit()
 
 			// parse errors
 			errs, ok := result.(validation.Errors)
 			if !ok && result != nil {
-				t.Errorf("(%d) Failed to parse errors %v", i, result)
-				return
+				t.Fatalf("Failed to parse errors %v", result)
 			}
 
 			// check errors
 			if len(errs) > len(s.expectedErrors) {
-				t.Errorf("(%d) Expected error keys %v, got %v", i, s.expectedErrors, errs)
-				return
+				t.Fatalf("Expected error keys %v, got %v", s.expectedErrors, errs)
 			}
 			for _, k := range s.expectedErrors {
 				if _, ok := errs[k]; !ok {
-					t.Errorf("(%d) Missing expected error key %q in %v", i, k, errs)
-					return
+					t.Fatalf("Missing expected error key %q in %v", k, errs)
 				}
 			}
 
@@ -60,24 +64,33 @@ func TestEmailSendValidateAndSubmit(t *testing.T) {
 				expectedEmails = 0
 			}
 
-			if app.TestMailer.TotalSend != expectedEmails {
-				t.Errorf("(%d) Expected %d email(s) to be sent, got %d", i, expectedEmails, app.TestMailer.TotalSend)
+			if app.TestMailer.TotalSend() != expectedEmails {
+				t.Fatalf("Expected %d email(s) to be sent, got %d", expectedEmails, app.TestMailer.TotalSend())
 			}
 
 			if len(s.expectedErrors) > 0 {
 				return
 			}
 
-			expectedContent := "Verify"
-			if s.template == "password-reset" {
+			var expectedContent string
+			switch s.template {
+			case forms.TestTemplatePasswordReset:
 				expectedContent = "Reset password"
-			} else if s.template == "email-change" {
+			case forms.TestTemplateEmailChange:
 				expectedContent = "Confirm new email"
+			case forms.TestTemplateVerification:
+				expectedContent = "Verify"
+			case forms.TestTemplateOTP:
+				expectedContent = "one-time password"
+			case forms.TestTemplateAuthAlert:
+				expectedContent = "from a new location"
+			default:
+				expectedContent = "__UNKNOWN_TEMPLATE__"
 			}
 
-			if !strings.Contains(app.TestMailer.LastMessage.HTML, expectedContent) {
-				t.Errorf("(%d) Expected the email to contains %s, got \n%v", i, expectedContent, app.TestMailer.LastMessage.HTML)
+			if !strings.Contains(app.TestMailer.LastMessage().HTML, expectedContent) {
+				t.Errorf("Expected the email to contains %q, got\n%v", expectedContent, app.TestMailer.LastMessage().HTML)
 			}
-		}()
+		})
 	}
 }