diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-12 09:19:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-12 09:19:52 -0500 |
commit | b066b6df138e88e75cb40f1ec3e58fbd13e61909 (patch) | |
tree | 7ee0e8c935cd3bbafd15d0d07d8900af8b82a4e0 /app/job_test.go | |
parent | 674a606bd00b276d0a05b3b29a3d5f5e5e7f8206 (diff) | |
download | chat-b066b6df138e88e75cb40f1ec3e58fbd13e61909.tar.gz chat-b066b6df138e88e75cb40f1ec3e58fbd13e61909.tar.bz2 chat-b066b6df138e88e75cb40f1ec3e58fbd13e61909.zip |
Remove global app references (#7433)
* remove global app references
* test fix
* fix api4 test compilation
Diffstat (limited to 'app/job_test.go')
-rw-r--r-- | app/job_test.go | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/app/job_test.go b/app/job_test.go index 1a8acb3ce..18186cc47 100644 --- a/app/job_test.go +++ b/app/job_test.go @@ -11,20 +11,19 @@ import ( ) func TestGetJob(t *testing.T) { - a := Global() - a.Setup() + th := Setup() status := &model.Job{ Id: model.NewId(), Status: model.NewId(), } - if result := <-a.Srv.Store.Job().Save(status); result.Err != nil { + if result := <-th.App.Srv.Store.Job().Save(status); result.Err != nil { t.Fatal(result.Err) } - defer a.Srv.Store.Job().Delete(status.Id) + defer th.App.Srv.Store.Job().Delete(status.Id) - if received, err := a.GetJob(status.Id); err != nil { + if received, err := th.App.GetJob(status.Id); err != nil { t.Fatal(err) } else if received.Id != status.Id || received.Status != status.Status { t.Fatal("inccorrect job status received") @@ -32,8 +31,7 @@ func TestGetJob(t *testing.T) { } func TestGetJobByType(t *testing.T) { - a := Global() - a.Setup() + th := Setup() jobType := model.NewId() @@ -56,11 +54,11 @@ func TestGetJobByType(t *testing.T) { } for _, status := range statuses { - store.Must(a.Srv.Store.Job().Save(status)) - defer a.Srv.Store.Job().Delete(status.Id) + store.Must(th.App.Srv.Store.Job().Save(status)) + defer th.App.Srv.Store.Job().Delete(status.Id) } - if received, err := a.GetJobsByType(jobType, 0, 2); err != nil { + if received, err := th.App.GetJobsByType(jobType, 0, 2); err != nil { t.Fatal(err) } else if len(received) != 2 { t.Fatal("received wrong number of statuses") @@ -70,7 +68,7 @@ func TestGetJobByType(t *testing.T) { t.Fatal("should've received second newest job second") } - if received, err := a.GetJobsByType(jobType, 2, 2); err != nil { + if received, err := th.App.GetJobsByType(jobType, 2, 2); err != nil { t.Fatal(err) } else if len(received) != 1 { t.Fatal("received wrong number of statuses") |