app type transition (#7167)

app/oauth_test.go

@@ -11,8 +11,9 @@ import (
 )
 
 func TestOAuthRevokeAccessToken(t *testing.T) {
-	Setup()
-	if err := RevokeAccessToken(model.NewRandomString(16)); err == nil {
+	a := Global()
+	a.Setup()
+	if err := a.RevokeAccessToken(model.NewRandomString(16)); err == nil {
 		t.Fatal("Should have failed bad token")
 	}
 
@@ -23,8 +24,8 @@ func TestOAuthRevokeAccessToken(t *testing.T) {
 	session.Roles = model.ROLE_SYSTEM_USER.Id
 	session.SetExpireInDays(1)
 
-	session, _ = CreateSession(session)
-	if err := RevokeAccessToken(session.Token); err == nil {
+	session, _ = a.CreateSession(session)
+	if err := a.RevokeAccessToken(session.Token); err == nil {
 		t.Fatal("Should have failed does not have an access token")
 	}
 
@@ -35,17 +36,18 @@ func TestOAuthRevokeAccessToken(t *testing.T) {
 	accessData.ClientId = model.NewId()
 	accessData.ExpiresAt = session.ExpiresAt
 
-	if result := <-Srv.Store.OAuth().SaveAccessData(accessData); result.Err != nil {
+	if result := <-a.Srv.Store.OAuth().SaveAccessData(accessData); result.Err != nil {
 		t.Fatal(result.Err)
 	}
 
-	if err := RevokeAccessToken(accessData.Token); err != nil {
+	if err := a.RevokeAccessToken(accessData.Token); err != nil {
 		t.Fatal(err)
 	}
 }
 
 func TestOAuthDeleteApp(t *testing.T) {
-	Setup()
+	a := Global()
+	a.Setup()
 
 	oldSetting := utils.Cfg.ServiceSettings.EnableOAuthServiceProvider
 	defer func() {
@@ -60,7 +62,7 @@ func TestOAuthDeleteApp(t *testing.T) {
 	a1.Homepage = "https://nowhere.com"
 
 	var err *model.AppError
-	a1, err = CreateOAuthApp(a1)
+	a1, err = a.CreateOAuthApp(a1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -73,7 +75,7 @@ func TestOAuthDeleteApp(t *testing.T) {
 	session.IsOAuth = true
 	session.SetExpireInDays(1)
 
-	session, _ = CreateSession(session)
+	session, _ = a.CreateSession(session)
 
 	accessData := &model.AccessData{}
 	accessData.Token = session.Token
@@ -82,15 +84,15 @@ func TestOAuthDeleteApp(t *testing.T) {
 	accessData.ClientId = a1.Id
 	accessData.ExpiresAt = session.ExpiresAt
 
-	if result := <-Srv.Store.OAuth().SaveAccessData(accessData); result.Err != nil {
+	if result := <-a.Srv.Store.OAuth().SaveAccessData(accessData); result.Err != nil {
 		t.Fatal(result.Err)
 	}
 
-	if err := DeleteOAuthApp(a1.Id); err != nil {
+	if err := a.DeleteOAuthApp(a1.Id); err != nil {
 		t.Fatal(err)
 	}
 
-	if _, err := GetSession(session.Token); err == nil {
+	if _, err := a.GetSession(session.Token); err == nil {
 		t.Fatal("should not get session from cache or db")
 	}
 }