Merge pull request #106 from overleaf/em-upgrade-node-12

Upgrade to Node 12

services/track-changes/.mocharc.json

@@ -0,0 +1,3 @@
+{
+  "require": "test/setup.js"
+}

services/track-changes/.nvmrc

@@ -1 +1 @@
-10.23.1
+12.21.0

services/track-changes/Dockerfile

@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 
-FROM node:10.23.1 as base
+FROM node:12.21.0 as base
 
 WORKDIR /app
 

services/track-changes/Makefile

@@ -21,8 +21,10 @@ DOCKER_COMPOSE_TEST_UNIT = \
 	COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)
 
 clean:
-	docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
-	docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local
+	-$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local
 
 format:
 	$(DOCKER_COMPOSE) run --rm test_unit npm run --silent format

services/track-changes/buildscript.txt

@@ -3,6 +3,6 @@ track-changes
 --docker-repos=gcr.io/overleaf-ops
 --env-add=AWS_BUCKET=bucket
 --env-pass-through=
---node-version=10.23.1
+--node-version=12.21.0
 --public-repo=True
---script-version=3.4.0
+--script-version=3.7.0

services/track-changes/docker-compose.yml

@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:10.23.1
+    image: node:12.21.0
     volumes:
       - .:/app
     working_dir: /app
@@ -18,7 +18,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:10.23.1
+    image: node:12.21.0
     volumes:
       - .:/app
     working_dir: /app

services/track-changes/test/acceptance/js/AppendingUpdatesTests.js

@@ -11,9 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const { ObjectId } = require('../../../app/js/mongodb')
 const Settings = require('settings-sharelatex')
 const request = require('request')

services/track-changes/test/acceptance/js/ArchivingUpdatesTests.js

@@ -15,9 +15,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const { db, ObjectId } = require('../../../app/js/mongodb')
 const Settings = require('settings-sharelatex')
 const request = require('request')

services/track-changes/test/acceptance/js/FlushingUpdatesTests.js

@@ -11,9 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const { ObjectId } = require('../../../app/js/mongodb')
 const Settings = require('settings-sharelatex')
 const request = require('request')

services/track-changes/test/acceptance/js/GettingADiffTests.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const { ObjectId } = require('../../../app/js/mongodb')
 const Settings = require('settings-sharelatex')
 

services/track-changes/test/acceptance/js/GettingUpdatesTests.js

@@ -11,9 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const { ObjectId } = require('../../../app/js/mongodb')
 const Settings = require('settings-sharelatex')
 

services/track-changes/test/acceptance/js/LockManagerTests.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const Settings = require('settings-sharelatex')
 const LockManager = require('../../../app/js/LockManager')
 const rclient = require('redis').createClient(Settings.redis.history) // Only works locally for now

services/track-changes/test/acceptance/js/RestoringVersions.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const { ObjectId } = require('../../../app/js/mongodb')
 const Settings = require('settings-sharelatex')
 

services/track-changes/test/acceptance/js/helpers/TrackChangesApp.js

@@ -14,7 +14,6 @@
  */
 const app = require('../../../../app')
 const { waitForDb } = require('../../../../app/js/mongodb')
-require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const Settings = require('settings-sharelatex')
 

services/track-changes/test/setup.js

@@ -0,0 +1,21 @@
+const chai = require('chai')
+const SandboxedModule = require('sandboxed-module')
+
+// Chai configuration
+chai.should()
+
+// SandboxedModule configuration
+SandboxedModule.configure({
+  requires: {
+    'logger-sharelatex': {
+      debug() {},
+      log() {},
+      info() {},
+      warn() {},
+      err() {},
+      error() {},
+      fatal() {}
+    }
+  },
+  globals: { Buffer, JSON, console, process }
+})

services/track-changes/test/unit/js/DiffGenerator/DiffGeneratorTests.js

@@ -11,19 +11,13 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/DiffGenerator.js'
 const SandboxedModule = require('sandboxed-module')
 
 describe('DiffGenerator', function () {
   beforeEach(function () {
-    this.DiffGenerator = SandboxedModule.require(modulePath, {
-      requires: {
-        'logger-sharelatex': { warn: sinon.stub() }
-      }
-    })
+    this.DiffGenerator = SandboxedModule.require(modulePath, {})
     this.ts = Date.now()
     this.user_id = 'mock-user-id'
     this.user_id_2 = 'mock-user-id-2'

services/track-changes/test/unit/js/DiffManager/DiffManagerTests.js

@@ -11,9 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/DiffManager.js'
 const SandboxedModule = require('sandboxed-module')
 
@@ -21,11 +19,6 @@ describe('DiffManager', function () {
   beforeEach(function () {
     this.DiffManager = SandboxedModule.require(modulePath, {
       requires: {
-        'logger-sharelatex': (this.logger = {
-          log: sinon.stub(),
-          error: sinon.stub(),
-          warn: sinon.stub()
-        }),
         './UpdatesManager': (this.UpdatesManager = {}),
         './DocumentUpdaterManager': (this.DocumentUpdaterManager = {}),
         './DiffGenerator': (this.DiffGenerator = {})

services/track-changes/test/unit/js/DocArchive/MongoAWS.js

@@ -9,8 +9,6 @@
  * DS102: Remove unnecessary code created because of implicit returns
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const chai = require('chai')
-chai.should()
 const sinon = require('sinon')
 const modulePath = '../../../../app/js/MongoAWS.js'
 const SandboxedModule = require('sandboxed-module')
@@ -36,11 +34,6 @@ describe('MongoAWS', function () {
         }),
         child_process: (this.child_process = {}),
         'mongo-uri': (this.mongouri = {}),
-        'logger-sharelatex': (this.logger = {
-          log: sinon.stub(),
-          error: sinon.stub(),
-          err() {}
-        }),
         'aws-sdk': (this.awssdk = {}),
         fs: (this.fs = {}),
         's3-streams': (this.S3S = {}),

services/track-changes/test/unit/js/DocumentUpdaterManager/DocumentUpdaterManagerTests.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/DocumentUpdaterManager.js'
 const SandboxedModule = require('sandboxed-module')
 
@@ -21,10 +19,6 @@ describe('DocumentUpdaterManager', function () {
     this.DocumentUpdaterManager = SandboxedModule.require(modulePath, {
       requires: {
         request: (this.request = {}),
-        'logger-sharelatex': (this.logger = {
-          log: sinon.stub(),
-          error: sinon.stub()
-        }),
         'settings-sharelatex': (this.settings = {
           apis: { documentupdater: { url: 'http://example.com' } }
         })

services/track-changes/test/unit/js/HttpController/HttpControllerTests.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/HttpController.js'
 const SandboxedModule = require('sandboxed-module')
 
@@ -21,7 +19,6 @@ describe('HttpController', function () {
     this.HttpController = SandboxedModule.require(modulePath, {
       singleOnly: true,
       requires: {
-        'logger-sharelatex': { log: sinon.stub() },
         './UpdatesManager': (this.UpdatesManager = {}),
         './DiffManager': (this.DiffManager = {}),
         './RestoreManager': (this.RestoreManager = {}),

services/track-changes/test/unit/js/LockManager/LockManagerTests.js

@@ -16,9 +16,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/LockManager.js'
 const SandboxedModule = require('sandboxed-module')
 
@@ -36,8 +34,7 @@ describe('LockManager', function () {
             return (this.rclient = { auth: sinon.stub() })
           }
         },
-        'settings-sharelatex': this.Settings,
-        'logger-sharelatex': { error() {} }
+        'settings-sharelatex': this.Settings
       }
     })
 

services/track-changes/test/unit/js/MongoManager/MongoManagerTests.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/MongoManager.js'
 const packModulePath = '../../../../app/js/PackManager.js'
 const SandboxedModule = require('sandboxed-module')
@@ -26,8 +24,7 @@ describe('MongoManager', function () {
       requires: {
         './mongodb': { db: (this.db = {}), ObjectId },
         './PackManager': (this.PackManager = {}),
-        '@overleaf/metrics': { timeAsyncMethod() {} },
-        'logger-sharelatex': { log() {} }
+        '@overleaf/metrics': { timeAsyncMethod() {} }
       }
     })
     this.callback = sinon.stub()

services/track-changes/test/unit/js/PackManager/PackManagerTests.js

@@ -11,10 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const { assert } = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { assert, expect } = require('chai')
 const modulePath = '../../../../app/js/PackManager.js'
 const SandboxedModule = require('sandboxed-module')
 const { ObjectId } = require('mongodb')
@@ -31,7 +28,6 @@ describe('PackManager', function () {
         './mongodb': { db: (this.db = {}), ObjectId },
         './LockManager': {},
         './MongoAWS': {},
-        'logger-sharelatex': { log: sinon.stub(), error: sinon.stub() },
         '@overleaf/metrics': { inc() {} },
         './ProjectIterator': require('../../../../app/js/ProjectIterator.js'), // Cache for speed
         'settings-sharelatex': {

services/track-changes/test/unit/js/RedisManager/RedisManagerTests.js

@@ -12,9 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/RedisManager.js'
 const SandboxedModule = require('sandboxed-module')
 

services/track-changes/test/unit/js/RestoreManager/RestoreManagerTests.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/RestoreManager.js'
 const SandboxedModule = require('sandboxed-module')
 
@@ -20,10 +18,6 @@ describe('RestoreManager', function () {
   beforeEach(function () {
     this.RestoreManager = SandboxedModule.require(modulePath, {
       requires: {
-        'logger-sharelatex': (this.logger = {
-          log: sinon.stub(),
-          error: sinon.stub()
-        }),
         './DocumentUpdaterManager': (this.DocumentUpdaterManager = {}),
         './DiffManager': (this.DiffManager = {})
       }

services/track-changes/test/unit/js/UpdateCompressor/UpdateCompressorTests.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/UpdateCompressor.js'
 const SandboxedModule = require('sandboxed-module')
 

services/track-changes/test/unit/js/UpdateTrimmer/UpdateTrimmerTests.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/UpdateTrimmer.js'
 const SandboxedModule = require('sandboxed-module')
 const tk = require('timekeeper')
@@ -24,10 +22,6 @@ describe('UpdateTrimmer', function () {
 
     this.UpdateTrimmer = SandboxedModule.require(modulePath, {
       requires: {
-        'logger-sharelatex': (this.logger = {
-          log: sinon.stub(),
-          error: sinon.stub()
-        }),
         './WebApiManager': (this.WebApiManager = {}),
         './MongoManager': (this.MongoManager = {})
       }

services/track-changes/test/unit/js/UpdatesManager/UpdatesManagerTests.js

@@ -14,9 +14,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const { ObjectId } = require('mongodb')
 const modulePath = '../../../../app/js/UpdatesManager.js'
 const SandboxedModule = require('sandboxed-module')
@@ -34,7 +32,6 @@ describe('UpdatesManager', function () {
         './WebApiManager': (this.WebApiManager = {}),
         './UpdateTrimmer': (this.UpdateTrimmer = {}),
         './DocArchiveManager': (this.DocArchiveManager = {}),
-        'logger-sharelatex': { log: sinon.stub(), error: sinon.stub() },
         'settings-sharelatex': {
           redis: {
             lock: {

services/track-changes/test/unit/js/WebApiManager/WebApiManagerTests.js

@@ -10,9 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const sinon = require('sinon')
-const chai = require('chai')
-const should = chai.should()
-const { expect } = chai
+const { expect } = require('chai')
 const modulePath = '../../../../app/js/WebApiManager.js'
 const SandboxedModule = require('sandboxed-module')
 
@@ -21,10 +19,6 @@ describe('WebApiManager', function () {
     this.WebApiManager = SandboxedModule.require(modulePath, {
       requires: {
         requestretry: (this.request = {}),
-        'logger-sharelatex': (this.logger = {
-          log: sinon.stub(),
-          error: sinon.stub()
-        }),
         'settings-sharelatex': (this.settings = {
           apis: {
             web: {