From 3a45d270ec33cfc1d728c9a12e31d47d4e1f3ccd Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Wed, 19 May 2021 13:07:22 +0100 Subject: [PATCH] Upgrade settings-sharelatex to 1.3.0 (#4065) GitOrigin-RevId: bd24ba44203cf559758f2ff7291723af98b489aa --- services/web/package-lock.json | 6 +++--- services/web/package.json | 2 +- .../web/test/acceptance/src/BackFillDummyDocMetaTests.js | 9 ++++----- .../acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js | 7 +++---- .../src/RegenerateDuplicateReferralIdsTests.js | 8 ++++---- services/web/test/acceptance/src/helpers/settings.js | 9 +++++++++ 6 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 services/web/test/acceptance/src/helpers/settings.js diff --git a/services/web/package-lock.json b/services/web/package-lock.json index c76e68e981..2b883e6e16 100644 --- a/services/web/package-lock.json +++ b/services/web/package-lock.json @@ -30719,9 +30719,9 @@ "integrity": "sha512-9jphSf3UbIgpOX/RKvX02iw/rN2TKdusnsPpGfO/rkcsrd+IRqgHZb4VGnmL0Cynps8Nj2hN45wsi30BzrHDIw==" }, "settings-sharelatex": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/settings-sharelatex/-/settings-sharelatex-1.2.0.tgz", - "integrity": "sha512-uqVRPHeL/jsHrAqzUX3Ie9hfId6DrEKnpX2ggepPl5x4LojkF+52TgwK7ephdS4EFwmK88VysTI1lrHGb2zqJg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/settings-sharelatex/-/settings-sharelatex-1.3.0.tgz", + "integrity": "sha512-AWSeCiY1eHi+z6DF4bmTyC3tusOc6EF5zDkC28aAOhEAbgVEIuY034kx1X7a4j9HE0iVs0sVOlZrQMWJBVk3oQ==", "requires": { "coffee-script": "1.6.0" }, diff --git a/services/web/package.json b/services/web/package.json index f00ea23007..4a9f9c4d52 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -160,7 +160,7 @@ "sanitize-html": "^1.27.1", "sanitizer": "0.1.1", "scroll-into-view-if-needed": "^2.2.25", - "settings-sharelatex": "^1.2.0", + "settings-sharelatex": "^1.3.0", "underscore": "^1.13.1", "url-parse": "^1.4.7", "utf-8-validate": "^5.0.2", diff --git a/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js b/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js index 404b054bec..b1cc277a25 100644 --- a/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js +++ b/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js @@ -2,6 +2,7 @@ const { exec } = require('child_process') const { promisify } = require('util') const { expect } = require('chai') const logger = require('logger-sharelatex') +const { filterOutput } = require('./helpers/settings') const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb') const DUMMY_NAME = 'unknown.tex' @@ -134,9 +135,7 @@ describe('BackFillDummyDocMeta', function () { } let { stderr: stdErr, stdout: stdOut } = result stdErr = stdErr.split('\n') - stdOut = stdOut - .split('\n') - .filter(line => !line.includes('Using settings from')) + stdOut = stdOut.split('\n').filter(filterOutput) const oneDayFromProjectId9InSeconds = getSecondsFromObjectId(projectIds[9]) + ONE_DAY_IN_S @@ -166,7 +165,7 @@ describe('BackFillDummyDocMeta', function () { ] } - expect(stdOut).to.deep.equal([ + expect(stdOut.filter(filterOutput)).to.deep.equal([ `Back filling dummy meta data for ["${docIds[0]}"]`, `Orphaned deleted doc ${docIds[0]} (no deletedProjects entry)`, `Back filling dummy meta data for ["${docIds[1]}"]`, @@ -188,7 +187,7 @@ describe('BackFillDummyDocMeta', function () { ...overlappingPartStdOut, '', ]) - expect(stdErr).to.deep.equal([ + expect(stdErr.filter(filterOutput)).to.deep.equal([ ...`Options: ${JSON.stringify(options, null, 2)}`.split('\n'), 'Waiting for you to double check inputs for 1 ms', `Processed 1 until ${getObjectIdFromDate('2021-04-02T00:00:00.000Z')}`, diff --git a/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js b/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js index 5f3146d5f0..22afed51d4 100644 --- a/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js +++ b/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js @@ -2,6 +2,7 @@ const { exec } = require('child_process') const { promisify } = require('util') const { expect } = require('chai') const logger = require('logger-sharelatex') +const { filterOutput } = require('./helpers/settings') const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb') const ONE_DAY_IN_S = 60 * 60 * 24 @@ -129,10 +130,8 @@ describe('DeleteOrphanedDocsOnlineCheck', function () { throw error } let { stderr: stdErr, stdout: stdOut } = result - stdErr = stdErr.split('\n') - stdOut = stdOut - .split('\n') - .filter(line => !line.includes('Using settings from')) + stdErr = stdErr.split('\n').filter(filterOutput) + stdOut = stdOut.split('\n').filter(filterOutput) const oneDayFromProjectId9InSeconds = getSecondsFromObjectId(projectIds[9]) + ONE_DAY_IN_S diff --git a/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js b/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js index a030928ccd..c612c9c2cb 100644 --- a/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js +++ b/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js @@ -2,6 +2,7 @@ const { exec } = require('child_process') const { promisify } = require('util') const { expect } = require('chai') const logger = require('logger-sharelatex') +const { filterOutput } = require('./helpers/settings') const { db } = require('../../../app/src/infrastructure/mongodb') const BATCH_SIZE = 100 @@ -110,9 +111,8 @@ describe('RegenerateDuplicateReferralIds', function () { stdErr = stdErr .split('\n') .filter(line => !line.includes('DeprecationWarning')) - stdOut = stdOut - .split('\n') - .filter(line => !line.includes('Using settings from')) + .filter(filterOutput) + stdOut = stdOut.split('\n').filter(filterOutput) expect(stdErr).to.deep.equal([ `Completed batch ending ${firstBatch[BATCH_SIZE - 1]}`, `Completed batch ending ${secondBatch[BATCH_SIZE - 1]}`, @@ -121,7 +121,7 @@ describe('RegenerateDuplicateReferralIds', function () { 'Done.', '', ]) - expect(stdOut).to.deep.equal([ + expect(stdOut.filter(filterOutput)).to.deep.equal([ // only duplicates `Running update on batch with ids ${JSON.stringify(firstBatch)}`, 'Got duplicates from looking at batch.', diff --git a/services/web/test/acceptance/src/helpers/settings.js b/services/web/test/acceptance/src/helpers/settings.js new file mode 100644 index 0000000000..2070bbfac1 --- /dev/null +++ b/services/web/test/acceptance/src/helpers/settings.js @@ -0,0 +1,9 @@ +function filterOutput(line) { + return ( + !line.startsWith('Using settings from ') && + !line.startsWith('Using default settings from ') && + !line.startsWith('CoffeeScript settings file') + ) +} + +module.exports = { filterOutput }