summaryrefslogtreecommitdiffstats
path: root/web/web_test.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-01-20 13:12:19 -0600
committerCorey Hulen <corey@hulen.com>2016-01-20 13:12:19 -0600
commit0b1aff3b24b4ac2df8e963c83d6e52b127c603f9 (patch)
tree47735a3dd609e025837df4460b0d030454358cf1 /web/web_test.go
parent1acd38b7b19521d06d274c42c00ce7072cd92196 (diff)
parent75f8729e2d25467500778e633c45c97e78a8f7a0 (diff)
downloadchat-0b1aff3b24b4ac2df8e963c83d6e52b127c603f9.tar.gz
chat-0b1aff3b24b4ac2df8e963c83d6e52b127c603f9.tar.bz2
chat-0b1aff3b24b4ac2df8e963c83d6e52b127c603f9.zip
Merge pull request #1930 from mattermost/PLT-7-server-db
PLT-7 adding loc for db calls
Diffstat (limited to 'web/web_test.go')
-rw-r--r--web/web_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/web_test.go b/web/web_test.go
index 8d40810b5..51dfc673e 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -62,7 +62,7 @@ func TestGetAccessToken(t *testing.T) {
user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Password: "pwd"}
ruser := ApiClient.Must(ApiClient.CreateUser(&user, "")).Data.(*model.User)
- store.Must(api.Srv.Store.User().VerifyEmail(ruser.Id))
+ store.Must(api.Srv.Store.User().VerifyEmail(utils.T, ruser.Id))
app := &model.OAuthApp{Name: "TestApp" + model.NewId(), Homepage: "https://nowhere.com", Description: "test", CallbackUrls: []string{"https://nowhere.com"}}
@@ -191,7 +191,7 @@ func TestIncomingWebhook(t *testing.T) {
user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"}
user = ApiClient.Must(ApiClient.CreateUser(user, "")).Data.(*model.User)
- store.Must(api.Srv.Store.User().VerifyEmail(user.Id))
+ store.Must(api.Srv.Store.User().VerifyEmail(utils.T, user.Id))
ApiClient.LoginByEmail(team.Name, user.Email, "pwd")