diff --git a/api4/job_test.go b/api4/job_test.go index de846f29a5..d507dc6fe1 100644 --- a/api4/job_test.go +++ b/api4/job_test.go @@ -4,8 +4,6 @@ package api4 import ( - "os" - "path/filepath" "strings" "testing" @@ -173,109 +171,3 @@ func TestGetJobsByType(t *testing.T) { _, resp = th.Client.GetJobsByType(jobType, 0, 60) CheckForbiddenStatus(t, resp) } - -func TestDownloadJob(t *testing.T) { - th := Setup(t).InitBasic() - defer th.TearDown() - jobName := model.NewId() - job := &model.Job{ - Id: jobName, - Type: model.JOB_TYPE_MESSAGE_EXPORT, - Data: map[string]string{ - "export_type": "csv", - }, - Status: model.JOB_STATUS_SUCCESS, - } - - // DownloadExportResults is not set to true so we should get a not implemented error status - _, resp := th.Client.DownloadJob(job.Id) - CheckNotImplementedStatus(t, resp) - - th.App.UpdateConfig(func(cfg *model.Config) { - *cfg.MessageExportSettings.DownloadExportResults = true - }) - - // Normal user cannot download the results of these job (Doesn't have permission) - _, resp = th.Client.DownloadJob(job.Id) - CheckForbiddenStatus(t, resp) - - // System admin trying to download the results of a non-existant job - _, resp = th.SystemAdminClient.DownloadJob(job.Id) - CheckNotFoundStatus(t, resp) - - // Here we have a job that exist in our database but the results do not exist therefore when we try to download the results - // as a system admin, we should get a not found status. - _, err := th.App.Srv().Store.Job().Save(job) - require.Nil(t, err) - defer th.App.Srv().Store.Job().Delete(job.Id) - - filePath := "./data/export/" + job.Id + "/testdat.txt" - mkdirAllErr := os.MkdirAll(filepath.Dir(filePath), 0770) - require.Nil(t, mkdirAllErr) - os.Create(filePath) - - _, resp = th.SystemAdminClient.DownloadJob(job.Id) - CheckBadRequestStatus(t, resp) - - job.Data["is_downloadable"] = "true" - updateStatus, err := th.App.Srv().Store.Job().UpdateOptimistically(job, model.JOB_STATUS_SUCCESS) - require.True(t, updateStatus) - require.Nil(t, err) - - _, resp = th.SystemAdminClient.DownloadJob(job.Id) - CheckNotFoundStatus(t, resp) - - // Now we stub the results of the job into the same directory and try to download it again - // This time we should successfully retrieve the results without any error - filePath = "./data/export/" + job.Id + "/csv_export.zip" - mkdirAllErr = os.MkdirAll(filepath.Dir(filePath), 0770) - require.Nil(t, mkdirAllErr) - os.Create(filePath) - - _, resp = th.SystemAdminClient.DownloadJob(job.Id) - require.Nil(t, resp.Error) -} - -func TestCancelJob(t *testing.T) { - th := Setup(t) - defer th.TearDown() - - jobs := []*model.Job{ - { - Id: model.NewId(), - Type: model.NewId(), - Status: model.JOB_STATUS_PENDING, - }, - { - Id: model.NewId(), - Type: model.NewId(), - Status: model.JOB_STATUS_IN_PROGRESS, - }, - { - Id: model.NewId(), - Type: model.NewId(), - Status: model.JOB_STATUS_SUCCESS, - }, - } - - for _, job := range jobs { - _, err := th.App.Srv().Store.Job().Save(job) - require.Nil(t, err) - defer th.App.Srv().Store.Job().Delete(job.Id) - } - - _, resp := th.Client.CancelJob(jobs[0].Id) - CheckForbiddenStatus(t, resp) - - _, resp = th.SystemAdminClient.CancelJob(jobs[0].Id) - require.Nil(t, resp.Error) - - _, resp = th.SystemAdminClient.CancelJob(jobs[1].Id) - require.Nil(t, resp.Error) - - _, resp = th.SystemAdminClient.CancelJob(jobs[2].Id) - CheckInternalErrorStatus(t, resp) - - _, resp = th.SystemAdminClient.CancelJob(model.NewId()) - CheckInternalErrorStatus(t, resp) -} diff --git a/i18n/en.json b/i18n/en.json index 73dd65e9b2..7383e68de1 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5674,30 +5674,6 @@ "id": "ent.cluster.timeout.error", "translation": "Timed out waiting for cluster response" }, - { - "id": "ent.compliance.actiance.attachment.copy.appError", - "translation": "Unable to copy the attachment into the zip file." - }, - { - "id": "ent.compliance.actiance.file.creation.appError", - "translation": "There was an error creating actiance XML file" - }, - { - "id": "ent.compliance.actiance.warning.creation.appError", - "translation": "There was an error creating actiance warning text file" - }, - { - "id": "ent.compliance.actiance.warning.write.appError", - "translation": "There was an error writing to the actiance xml file" - }, - { - "id": "ent.compliance.actiance.xml.creation.appError", - "translation": "There was an error creating actiance XML file" - }, - { - "id": "ent.compliance.actiance.xml.write.appError", - "translation": "There was an error writing to the actiance XML file" - }, { "id": "ent.compliance.bad_export_type.appError", "translation": "Unknown output format {{.ExportType}}"