github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113 from overleaf/bg-cleanup

Browse source 
decaff cleanup for test helpers
This commit is contained in:
Brian Gough 2021-08-04 11:14:10 +01:00 committed by GitHub
commit c0c17ca5a1
2 changed files with 42 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/docstore/test/acceptance/js/helpers/DocstoreApp.js
View file

@ -1,16 +1,3 @@
/* eslint-disable
handle-callback-err,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
* DS102: Remove unnecessary code created because of implicit returns
* DS205: Consider reworking code to avoid use of IIFEs
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
const app = require('../../../../app') const app = require('../../../../app')
const { waitForDb } = require('../../../../app/js/mongodb') const { waitForDb } = require('../../../../app/js/mongodb')
require('logger-sharelatex').logger.level('error') require('logger-sharelatex').logger.level('error')

121
services/docstore/test/acceptance/js/helpers/DocstoreClient.js
View file

@ -1,16 +1,3 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-unused-vars,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
let DocstoreClient let DocstoreClient
const request = require('request').defaults({ jar: false }) const request = require('request').defaults({ jar: false })
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')
@ -32,13 +19,10 @@ async function getStringFromPersistor(persistor, bucket, key) {
} }
module.exports = DocstoreClient = { module.exports = DocstoreClient = {
createDoc(project_id, doc_id, lines, version, ranges, callback) { createDoc(projectId, docId, lines, version, ranges, callback) {
if (callback == null) {
callback = function (error) {}
}
return DocstoreClient.updateDoc( return DocstoreClient.updateDoc(
project_id, projectId,
doc_id, docId,
lines, lines,
version, version,
ranges, ranges,
@ -46,13 +30,10 @@ module.exports = DocstoreClient = {
) )
}, },
getDoc(project_id, doc_id, qs, callback) { getDoc(projectId, docId, qs, callback) {
if (callback == null) { request.get(
callback = function (error, res, body) {}
}
return request.get(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/doc/${doc_id}`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/doc/${docId}`,
json: true, json: true,
qs, qs,
}, },
@ -60,10 +41,10 @@ module.exports = DocstoreClient = {
) )
}, },
peekDoc(project_id, doc_id, qs, callback) { peekDoc(projectId, docId, qs, callback) {
request.get( request.get(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/doc/${doc_id}/peek`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/doc/${docId}/peek`,
json: true, json: true,
qs, qs,
}, },
@ -71,23 +52,20 @@ module.exports = DocstoreClient = {
) )
}, },
isDocDeleted(project_id, doc_id, callback) { isDocDeleted(projectId, docId, callback) {
request.get( request.get(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/doc/${doc_id}/deleted`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/doc/${docId}/deleted`,
json: true, json: true,
}, },
callback callback
) )
}, },
getAllDocs(project_id, callback) { getAllDocs(projectId, callback) {
if (callback == null) { request.get(
callback = function (error, res, body) {}
}
return request.get(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/doc`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/doc`,
json: true, json: true,
}, },
(req, res, body) => { (req, res, body) => {
@ -96,10 +74,10 @@ module.exports = DocstoreClient = {
) )
}, },
getAllDeletedDocs(project_id, callback) { getAllDeletedDocs(projectId, callback) {
request.get( request.get(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/doc-deleted`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/doc-deleted`,
json: true, json: true,
}, },
(error, res, body) => { (error, res, body) => {
@ -112,26 +90,20 @@ module.exports = DocstoreClient = {
) )
}, },
getAllRanges(project_id, callback) { getAllRanges(projectId, callback) {
if (callback == null) { request.get(
callback = function (error, res, body) {}
}
return request.get(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/ranges`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/ranges`,
json: true, json: true,
}, },
callback callback
) )
}, },
updateDoc(project_id, doc_id, lines, version, ranges, callback) { updateDoc(projectId, docId, lines, version, ranges, callback) {
if (callback == null) {
callback = function (error, res, body) {}
}
return request.post( return request.post(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/doc/${doc_id}`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/doc/${docId}`,
json: { json: {
lines, lines,
version, version,
@ -142,87 +114,78 @@ module.exports = DocstoreClient = {
) )
}, },
deleteDoc(project_id, doc_id, callback) { deleteDoc(projectId, docId, callback) {
DocstoreClient.deleteDocWithDateAndName( DocstoreClient.deleteDocWithDateAndName(
project_id, projectId,
doc_id, docId,
new Date(), new Date(),
'main.tex', 'main.tex',
callback callback
) )
}, },
deleteDocWithDate(project_id, doc_id, date, callback) { deleteDocWithDate(projectId, docId, date, callback) {
DocstoreClient.deleteDocWithDateAndName( DocstoreClient.deleteDocWithDateAndName(
project_id, projectId,
doc_id, docId,
date, date,
'main.tex', 'main.tex',
callback callback
) )
}, },
deleteDocWithName(project_id, doc_id, name, callback) { deleteDocWithName(projectId, docId, name, callback) {
DocstoreClient.deleteDocWithDateAndName( DocstoreClient.deleteDocWithDateAndName(
project_id, projectId,
doc_id, docId,
new Date(), new Date(),
name, name,
callback callback
) )
}, },
deleteDocWithDateAndName(project_id, doc_id, deletedAt, name, callback) { deleteDocWithDateAndName(projectId, docId, deletedAt, name, callback) {
request.patch( request.patch(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/doc/${doc_id}`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/doc/${docId}`,
json: { name, deleted: true, deletedAt }, json: { name, deleted: true, deletedAt },
}, },
callback callback
) )
}, },
archiveAllDoc(project_id, callback) { archiveAllDoc(projectId, callback) {
if (callback == null) { request.post(
callback = function (error, res, body) {}
}
return request.post(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/archive`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/archive`,
}, },
callback callback
) )
}, },
archiveDocById(project_id, doc_id, callback) { archiveDocById(projectId, docId, callback) {
if (callback == null) { request.post(
callback = function (error, res, body) {}
}
return request.post(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/doc/${doc_id}/archive`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/doc/${docId}/archive`,
}, },
callback callback
) )
}, },
destroyAllDoc(project_id, callback) { destroyAllDoc(projectId, callback) {
if (callback == null) { request.post(
callback = function (error, res, body) {}
}
return request.post(
{ {
url: `http://localhost:${settings.internal.docstore.port}/project/${project_id}/destroy`, url: `http://localhost:${settings.internal.docstore.port}/project/${projectId}/destroy`,
}, },
callback callback
) )
}, },
getS3Doc(project_id, doc_id, callback) { getS3Doc(projectId, docId, callback) {
getStringFromPersistor( getStringFromPersistor(
Persistor, Persistor,
settings.docstore.bucket, settings.docstore.bucket,
`${project_id}/${doc_id}` `${projectId}/${docId}`
) )
.then(data => { .then(data => {
callback(null, JSON.parse(data)) callback(null, JSON.parse(data))