Fix test

Author: lunny

models/user/email_address.go

@@ -25,10 +25,23 @@ import (
 var (
 	// ErrEmailNotActivated e-mail address has not been activated error
 	ErrEmailNotActivated = errors.New("e-mail address has not been activated")
-	// ErrEmailCharIsNotSupported e-mail address contains unsupported character
-	ErrEmailCharIsNotSupported = errors.New("e-mail address contains unsupported character")
 )
 
+// ErrEmailCharIsNotSupported e-mail address contains unsupported character
+type ErrEmailCharIsNotSupported struct {
+	Email string
+}
+
+// IsErrEmailCharIsNotSupported checks if an error is an ErrEmailCharIsNotSupported
+func IsErrEmailCharIsNotSupported(err error) bool {
+	_, ok := err.(ErrEmailCharIsNotSupported)
+	return ok
+}
+
+func (err ErrEmailCharIsNotSupported) Error() string {
+	return fmt.Sprintf("e-mail address contains unsupported character [email: %s]", err.Email)
+}
+
 // ErrEmailInvalid represents an error where the email address does not comply with RFC 5322
 type ErrEmailInvalid struct {
 	Email string
@@ -120,7 +133,7 @@ func ValidateEmail(email string) error {
 	}
 
 	if !emailRegexp.MatchString(email) {
-		return ErrEmailCharIsNotSupported
+		return ErrEmailCharIsNotSupported{email}
 	}
 
 	if !(email[0] >= 'a' && email[0] <= 'z') &&

models/user/email_address_test.go

@@ -278,7 +278,7 @@ func TestEmailAddressValidate(t *testing.T) {
 		`first|[email protected]`:            nil,
 		`first}[email protected]`:            nil,
 		`[email protected]`:            nil,
-		`first;[email protected]`:            ErrEmailCharIsNotSupported,
+		`first;[email protected]`:            ErrEmailCharIsNotSupported{`first;[email protected]`},
 		"[email protected]":                    ErrEmailInvalid{"[email protected]"},
 		"[email protected]":                    ErrEmailInvalid{"[email protected]"},
 		"#[email protected]":                    ErrEmailInvalid{"#[email protected]"},
@@ -297,9 +297,9 @@ func TestEmailAddressValidate(t *testing.T) {
 		"|[email protected]":                    ErrEmailInvalid{"|[email protected]"},
 		"}[email protected]":                    ErrEmailInvalid{"}[email protected]"},
 		"[email protected]":                    ErrEmailInvalid{"[email protected]"},
-		";[email protected]":                    ErrEmailCharIsNotSupported,
-		"Foo <[email protected]>":              ErrEmailCharIsNotSupported,
-		string([]byte{0xE2, 0x84, 0xAA}): ErrEmailCharIsNotSupported,
+		";[email protected]":                    ErrEmailCharIsNotSupported{";[email protected]"},
+		"Foo <[email protected]>":              ErrEmailCharIsNotSupported{"Foo <[email protected]>"},
+		string([]byte{0xE2, 0x84, 0xAA}): ErrEmailCharIsNotSupported{string([]byte{0xE2, 0x84, 0xAA})},
 	}
 	for kase, err := range kases {
 		t.Run(kase, func(t *testing.T) {

models/user/user_test.go

@@ -5,6 +5,7 @@
 package user
 
 import (
+	"fmt"
 	"math/rand"
 	"strings"
 	"testing"
@@ -232,7 +233,7 @@ func TestCreateUserInvalidEmail(t *testing.T) {
 
 	err := CreateUser(user)
 	assert.Error(t, err)
-	assert.True(t, IsErrEmailInvalid(err))
+	assert.True(t, IsErrEmailCharIsNotSupported(err))
 }
 
 func TestCreateUserEmailAlreadyUsed(t *testing.T) {