diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-20 13:36:16 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-20 13:36:16 -0600 |
| commit | aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b (patch) | |
| tree | d87809ff2a306e5428b0ab6973d05509baa21abd /api/preference_test.go | |
| parent | 0b1aff3b24b4ac2df8e963c83d6e52b127c603f9 (diff) | |
| download | chat-aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b.tar.gz chat-aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b.tar.bz2 chat-aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b.zip | |
Revert " PLT-7 adding loc for db calls"
Diffstat (limited to 'api/preference_test.go')
| -rw-r--r-- | api/preference_test.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/api/preference_test.go b/api/preference_test.go index 99ca12922..6bebe205c 100644 --- a/api/preference_test.go +++ b/api/preference_test.go @@ -6,7 +6,6 @@ package api import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" "testing" ) @@ -18,11 +17,11 @@ func TestGetAllPreferences(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) category := model.NewId() @@ -71,7 +70,7 @@ func TestSetPreferences(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -102,7 +101,7 @@ func TestSetPreferences(t *testing.T) { // not able to update as a different user user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") @@ -119,11 +118,11 @@ func TestGetPreferenceCategory(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) category := model.NewId() @@ -175,7 +174,7 @@ func TestGetPreference(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") |