Merge pull request #14 from overleaf/jpa-monorepo-prep

[misc] prepare for monorepo
This commit is contained in:
Jakob Ackermann 2021-07-28 10:36:22 +02:00 committed by GitHub
commit 27bbd4ec65
5 changed files with 4953 additions and 11 deletions

View file

@ -1,3 +1,5 @@
/node_modules /node_modules
package-lock.json
*.swp *.swp
.npmrc
Dockerfile

View file

@ -1 +0,0 @@
12.18.0

File diff suppressed because it is too large Load diff

View file

@ -163,9 +163,9 @@ module.exports = class FSPersistor extends AbstractPersistor {
try { try {
await Promise.all( await Promise.all(
(await fsGlob(`${location}/${filteredName}_*`)).map((file) => (
fsUnlink(file) await fsGlob(`${location}/${filteredName}_*`)
) ).map((file) => fsUnlink(file))
) )
} catch (err) { } catch (err) {
throw PersistorHelper.wrapError( throw PersistorHelper.wrapError(

View file

@ -195,9 +195,7 @@ describe('MigrationPersistorTests', function () {
}) })
it('should send a stream to the primary', function () { it('should send a stream to the primary', function () {
expect( expect(primaryPersistor.sendStream).to.have.been.calledWithExactly(
primaryPersistor.sendStream
).to.have.been.calledWithExactly(
bucket, bucket,
key, key,
sinon.match.instanceOf(Stream.PassThrough), sinon.match.instanceOf(Stream.PassThrough),
@ -476,9 +474,7 @@ describe('MigrationPersistorTests', function () {
}) })
it('should send the file to the primary', function () { it('should send the file to the primary', function () {
expect( expect(primaryPersistor.sendStream).to.have.been.calledWithExactly(
primaryPersistor.sendStream
).to.have.been.calledWithExactly(
bucket, bucket,
destKey, destKey,
sinon.match.instanceOf(Stream.PassThrough), sinon.match.instanceOf(Stream.PassThrough),