remove jobs.Srv and other jobs-related globals (#7535)

api4/apitestlib.go

@@ -23,7 +23,6 @@ import (
 	"github.com/mattermost/mattermost-server/utils"
 	"github.com/mattermost/mattermost-server/wsapi"
 
-	"github.com/mattermost/mattermost-server/jobs"
 	s3 "github.com/minio/minio-go"
 	"github.com/minio/minio-go/pkg/credentials"
 )
@@ -76,8 +75,8 @@ func setupTestHelper(enterprise bool) *TestHelper {
 		utils.License().Features.SetDefaults()
 	}
 
-	if jobs.Srv.Store == nil {
-		jobs.Srv.Store = th.App.Srv.Store
+	if th.App.Jobs.Store == nil {
+		th.App.Jobs.Store = th.App.Srv.Store
 	}
 
 	th.Client = th.CreateClient()

api4/job.go

@@ -52,7 +52,7 @@ func createJob(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if job, err := app.CreateJob(job); err != nil {
+	if job, err := c.App.CreateJob(job); err != nil {
 		c.Err = err
 		return
 	} else {
@@ -109,7 +109,7 @@ func cancelJob(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := app.CancelJob(c.Params.JobId); err != nil {
+	if err := c.App.CancelJob(c.Params.JobId); err != nil {
 		c.Err = err
 		return
 	}