summaryrefslogtreecommitdiffstats
path: root/api/file_test.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-07-06 00:50:42 -0800
committer=Corey Hulen <corey@hulen.com>2015-07-06 00:50:42 -0800
commit34fb817a4a4cd2761ba35a2c94f9d0eb79d06244 (patch)
treeeaf0ecaf55383449a5b2cc369fa8112109da7f0d /api/file_test.go
parentcbadc263864b1b0196b90b9afa1c68335f0ab7f1 (diff)
downloadchat-34fb817a4a4cd2761ba35a2c94f9d0eb79d06244.tar.gz
chat-34fb817a4a4cd2761ba35a2c94f9d0eb79d06244.tar.bz2
chat-34fb817a4a4cd2761ba35a2c94f9d0eb79d06244.zip
Fixing unit tests
Diffstat (limited to 'api/file_test.go')
-rw-r--r--api/file_test.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/api/file_test.go b/api/file_test.go
index e248cfac3..e334fd6e5 100644
--- a/api/file_test.go
+++ b/api/file_test.go
@@ -9,6 +9,7 @@ import (
"github.com/goamz/goamz/aws"
"github.com/goamz/goamz/s3"
"github.com/mattermost/platform/model"
+ "github.com/mattermost/platform/store"
"github.com/mattermost/platform/utils"
"io"
"mime/multipart"
@@ -28,7 +29,7 @@ func TestUploadFile(t *testing.T) {
user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
- <-Srv.Store.User().VerifyEmail(user1.Id)
+ store.Must(Srv.Store.User().VerifyEmail(user1.Id))
Client.LoginByEmail(team.Domain, user1.Email, "pwd")
@@ -115,7 +116,7 @@ func TestGetFile(t *testing.T) {
user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
- <-Srv.Store.User().VerifyEmail(user1.Id)
+ store.Must(Srv.Store.User().VerifyEmail(user1.Id))
Client.LoginByEmail(team.Domain, user1.Email, "pwd")
@@ -177,7 +178,7 @@ func TestGetFile(t *testing.T) {
user2 := &model.User{TeamId: team2.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User)
- <-Srv.Store.User().VerifyEmail(user2.Id)
+ store.Must(Srv.Store.User().VerifyEmail(user2.Id))
newProps := make(map[string]string)
newProps["filename"] = filenames[0]
@@ -262,11 +263,11 @@ func TestGetPublicLink(t *testing.T) {
user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
- <-Srv.Store.User().VerifyEmail(user1.Id)
+ store.Must(Srv.Store.User().VerifyEmail(user1.Id))
user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User)
- <-Srv.Store.User().VerifyEmail(user2.Id)
+ store.Must(Srv.Store.User().VerifyEmail(user2.Id))
Client.LoginByEmail(team.Domain, user1.Email, "pwd")