diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-20 13:12:19 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-20 13:12:19 -0600 |
commit | 0b1aff3b24b4ac2df8e963c83d6e52b127c603f9 (patch) | |
tree | 47735a3dd609e025837df4460b0d030454358cf1 /store/sql_oauth_store_test.go | |
parent | 1acd38b7b19521d06d274c42c00ce7072cd92196 (diff) | |
parent | 75f8729e2d25467500778e633c45c97e78a8f7a0 (diff) | |
download | chat-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 'store/sql_oauth_store_test.go')
-rw-r--r-- | store/sql_oauth_store_test.go | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/store/sql_oauth_store_test.go b/store/sql_oauth_store_test.go index c3f6ea7ac..f8d035a0c 100644 --- a/store/sql_oauth_store_test.go +++ b/store/sql_oauth_store_test.go @@ -5,6 +5,7 @@ package store import ( "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" "testing" ) @@ -17,7 +18,7 @@ func TestOAuthStoreSaveApp(t *testing.T) { a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" - if err := (<-store.OAuth().SaveApp(&a1)).Err; err != nil { + if err := (<-store.OAuth().SaveApp(utils.T, &a1)).Err; err != nil { t.Fatal(err) } } @@ -30,13 +31,13 @@ func TestOAuthStoreGetApp(t *testing.T) { a1.Name = "TestApp" + model.NewId() a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" - Must(store.OAuth().SaveApp(&a1)) + Must(store.OAuth().SaveApp(utils.T, &a1)) - if err := (<-store.OAuth().GetApp(a1.Id)).Err; err != nil { + if err := (<-store.OAuth().GetApp(utils.T, a1.Id)).Err; err != nil { t.Fatal(err) } - if err := (<-store.OAuth().GetAppByUser(a1.CreatorId)).Err; err != nil { + if err := (<-store.OAuth().GetAppByUser(utils.T, a1.CreatorId)).Err; err != nil { t.Fatal(err) } } @@ -49,13 +50,13 @@ func TestOAuthStoreUpdateApp(t *testing.T) { a1.Name = "TestApp" + model.NewId() a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" - Must(store.OAuth().SaveApp(&a1)) + Must(store.OAuth().SaveApp(utils.T, &a1)) a1.CreateAt = 1 a1.ClientSecret = "pwd" a1.CreatorId = "12345678901234567890123456" a1.Name = "NewName" - if result := <-store.OAuth().UpdateApp(&a1); result.Err != nil { + if result := <-store.OAuth().UpdateApp(utils.T, &a1); result.Err != nil { t.Fatal(result.Err) } else { ua1 := (result.Data.([2]*model.OAuthApp)[0]) @@ -82,7 +83,7 @@ func TestOAuthStoreSaveAccessData(t *testing.T) { a1.Token = model.NewId() a1.RefreshToken = model.NewId() - if err := (<-store.OAuth().SaveAccessData(&a1)).Err; err != nil { + if err := (<-store.OAuth().SaveAccessData(utils.T, &a1)).Err; err != nil { t.Fatal(err) } } @@ -94,9 +95,9 @@ func TestOAuthStoreGetAccessData(t *testing.T) { a1.AuthCode = model.NewId() a1.Token = model.NewId() a1.RefreshToken = model.NewId() - Must(store.OAuth().SaveAccessData(&a1)) + Must(store.OAuth().SaveAccessData(utils.T, &a1)) - if result := <-store.OAuth().GetAccessData(a1.Token); result.Err != nil { + if result := <-store.OAuth().GetAccessData(utils.T, a1.Token); result.Err != nil { t.Fatal(result.Err) } else { ra1 := result.Data.(*model.AccessData) @@ -105,11 +106,11 @@ func TestOAuthStoreGetAccessData(t *testing.T) { } } - if err := (<-store.OAuth().GetAccessDataByAuthCode(a1.AuthCode)).Err; err != nil { + if err := (<-store.OAuth().GetAccessDataByAuthCode(utils.T, a1.AuthCode)).Err; err != nil { t.Fatal(err) } - if err := (<-store.OAuth().GetAccessDataByAuthCode("junk")).Err; err != nil { + if err := (<-store.OAuth().GetAccessDataByAuthCode(utils.T, "junk")).Err; err != nil { t.Fatal(err) } } @@ -121,13 +122,13 @@ func TestOAuthStoreRemoveAccessData(t *testing.T) { a1.AuthCode = model.NewId() a1.Token = model.NewId() a1.RefreshToken = model.NewId() - Must(store.OAuth().SaveAccessData(&a1)) + Must(store.OAuth().SaveAccessData(utils.T, &a1)) - if err := (<-store.OAuth().RemoveAccessData(a1.Token)).Err; err != nil { + if err := (<-store.OAuth().RemoveAccessData(utils.T, a1.Token)).Err; err != nil { t.Fatal(err) } - if result := <-store.OAuth().GetAccessDataByAuthCode(a1.AuthCode); result.Err != nil { + if result := <-store.OAuth().GetAccessDataByAuthCode(utils.T, a1.AuthCode); result.Err != nil { t.Fatal(result.Err) } else { if result.Data != nil { @@ -144,7 +145,7 @@ func TestOAuthStoreSaveAuthData(t *testing.T) { a1.UserId = model.NewId() a1.Code = model.NewId() - if err := (<-store.OAuth().SaveAuthData(&a1)).Err; err != nil { + if err := (<-store.OAuth().SaveAuthData(utils.T, &a1)).Err; err != nil { t.Fatal(err) } } @@ -156,9 +157,9 @@ func TestOAuthStoreGetAuthData(t *testing.T) { a1.ClientId = model.NewId() a1.UserId = model.NewId() a1.Code = model.NewId() - Must(store.OAuth().SaveAuthData(&a1)) + Must(store.OAuth().SaveAuthData(utils.T, &a1)) - if err := (<-store.OAuth().GetAuthData(a1.Code)).Err; err != nil { + if err := (<-store.OAuth().GetAuthData(utils.T, a1.Code)).Err; err != nil { t.Fatal(err) } } @@ -170,13 +171,13 @@ func TestOAuthStoreRemoveAuthData(t *testing.T) { a1.ClientId = model.NewId() a1.UserId = model.NewId() a1.Code = model.NewId() - Must(store.OAuth().SaveAuthData(&a1)) + Must(store.OAuth().SaveAuthData(utils.T, &a1)) - if err := (<-store.OAuth().RemoveAuthData(a1.Code)).Err; err != nil { + if err := (<-store.OAuth().RemoveAuthData(utils.T, a1.Code)).Err; err != nil { t.Fatal(err) } - if err := (<-store.OAuth().GetAuthData(a1.Code)).Err; err == nil { + if err := (<-store.OAuth().GetAuthData(utils.T, a1.Code)).Err; err == nil { t.Fatal("should have errored - auth code removed") } } @@ -188,9 +189,9 @@ func TestOAuthStoreRemoveAuthDataByUser(t *testing.T) { a1.ClientId = model.NewId() a1.UserId = model.NewId() a1.Code = model.NewId() - Must(store.OAuth().SaveAuthData(&a1)) + Must(store.OAuth().SaveAuthData(utils.T, &a1)) - if err := (<-store.OAuth().PermanentDeleteAuthDataByUser(a1.UserId)).Err; err != nil { + if err := (<-store.OAuth().PermanentDeleteAuthDataByUser(utils.T, a1.UserId)).Err; err != nil { t.Fatal(err) } } |