summaryrefslogtreecommitdiffstats
path: root/app/user_test.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-03-10 05:18:18 -0500
committerGeorge Goldberg <george@gberg.me>2017-03-10 10:18:18 +0000
commita8e68bd8905972ae59de90fa33d5b3e3c274dc47 (patch)
treec809d33800262830f2497813fcea2c5bb482ac1b /app/user_test.go
parent43e5bbea372cb2c4a98d00fae19cdabd165a8f48 (diff)
downloadchat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.gz
chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.bz2
chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.zip
PLT-5765 Passed SiteURL to SendNotifications (#5705)
Diffstat (limited to 'app/user_test.go')
-rw-r--r--app/user_test.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/user_test.go b/app/user_test.go
index ec0e2b73c..d8d6bdc79 100644
--- a/app/user_test.go
+++ b/app/user_test.go
@@ -70,7 +70,7 @@ func TestCreateOAuthUser(t *testing.T) {
glUser := oauthgitlab.GitLabUser{Id: int64(r.Intn(1000)), Username: "joram" + model.NewId(), Email: model.NewId() + "@simulator.amazonses.com", Name: "Joram Wilander"}
json := glUser.ToJson()
- user, err := CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id)
+ user, err := CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id, utils.GetSiteURL())
if err != nil {
t.Fatal(err)
}
@@ -87,7 +87,7 @@ func TestCreateOAuthUser(t *testing.T) {
}()
utils.Cfg.TeamSettings.EnableUserCreation = false
- _, err = CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id)
+ _, err = CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id, utils.GetSiteURL())
if err == nil {
t.Fatal("should have failed - user creation disabled")
}
@@ -253,7 +253,7 @@ func createGitlabUser(t *testing.T, email string, username string) (*model.User,
var user *model.User
var err *model.AppError
- if user, err = CreateOAuthUser("gitlab", bytes.NewReader(gitlabUser), ""); err != nil {
+ if user, err = CreateOAuthUser("gitlab", bytes.NewReader(gitlabUser), "", utils.GetSiteURL()); err != nil {
t.Fatal("unable to create the user")
}