IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert EN JSON changes (#15718)

Browse Source 
* Revert EN JSON stuff

* Update en.json

* updat en.json

* Fix translation

* Comment out download job test

* Remove test

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Hossein Ahmadian-Yazdi
2020-10-05 09:52:22 -04:00
committed by GitHub
parent ebd3e6aa49
commit 716b64a99c
2 changed files with 0 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
api4/job_test.go
View File

@@ -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)
}

24
i18n/en.json
View File

@@ -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}}"