summaryrefslogtreecommitdiffstats
path: root/app/user_test.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2018-08-01 15:18:14 -0400
committerGitHub <noreply@github.com>2018-08-01 15:18:14 -0400
commitc34b30a6e7fb707ae12e78a51e5bd776e5ca85ed (patch)
tree54a3a5d715fb0cf337c98a47efc4a75f7b23a791 /app/user_test.go
parenta8cc646eede863e35eff3017f4472ec6f9ad01a4 (diff)
downloadchat-c34b30a6e7fb707ae12e78a51e5bd776e5ca85ed.tar.gz
chat-c34b30a6e7fb707ae12e78a51e5bd776e5ca85ed.tar.bz2
chat-c34b30a6e7fb707ae12e78a51e5bd776e5ca85ed.zip
MM-11521/MM-11522 Fix being able to create users with invalid emails through API (#9199)
* MM-11522 Fix being able to create users with invalid emails through API * Ensure store tests are using valid emails * Add missing license header * Remove invalid test case * Fix TestUpdateOAuthUserAttrs
Diffstat (limited to 'app/user_test.go')
-rw-r--r--app/user_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/user_test.go b/app/user_test.go
index 959455121..92ff4d62a 100644
--- a/app/user_test.go
+++ b/app/user_test.go
@@ -250,7 +250,7 @@ func TestUpdateOAuthUserAttrs(t *testing.T) {
func getUserFromDB(a *App, id string, t *testing.T) *model.User {
if user, err := a.GetUser(id); err != nil {
- t.Fatal("user is not found")
+ t.Fatal("user is not found", err)
return nil
} else {
return user
@@ -261,13 +261,13 @@ func getGitlabUserPayload(gitlabUser oauthgitlab.GitLabUser, t *testing.T) []byt
var payload []byte
var err error
if payload, err = json.Marshal(gitlabUser); err != nil {
- t.Fatal("Serialization of gitlab user to json failed")
+ t.Fatal("Serialization of gitlab user to json failed", err)
}
return payload
}
-func createGitlabUser(t *testing.T, a *App, email string, username string) (*model.User, oauthgitlab.GitLabUser) {
+func createGitlabUser(t *testing.T, a *App, username string, email string) (*model.User, oauthgitlab.GitLabUser) {
r := rand.New(rand.NewSource(time.Now().UnixNano()))
gitlabUserObj := oauthgitlab.GitLabUser{Id: int64(r.Intn(1000)) + 1, Username: username, Login: "user1", Email: email, Name: "Test User"}
gitlabUser := getGitlabUserPayload(gitlabUserObj, t)
@@ -276,7 +276,7 @@ func createGitlabUser(t *testing.T, a *App, email string, username string) (*mod
var err *model.AppError
if user, err = a.CreateOAuthUser("gitlab", bytes.NewReader(gitlabUser), ""); err != nil {
- t.Fatal("unable to create the user")
+ t.Fatal("unable to create the user", err)
}
return user, gitlabUserObj