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

Upgrade to Node 12

services/contacts/.mocharc.json

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

services/contacts/.nvmrc

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

services/contacts/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/contacts/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 ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
-	docker rmi gcr.io/overleaf-ops/$(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/contacts/buildscript.txt

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

services/contacts/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/contacts/test/setup.js

@@ -0,0 +1,9 @@
+const SandboxedModule = require('sandboxed-module')
+
+SandboxedModule.configure({
+  requires: {
+    'logger-sharelatex': { log() {} },
+    '@overleaf/metrics': { timeAsyncMethod() {} }
+  },
+  globals: { Buffer, console, process }
+})

services/contacts/test/unit/js/ContactsManagerTests.js

@@ -26,9 +26,7 @@ describe('ContactManager', function () {
         './mongodb': {
           db: (this.db = { contacts: {} }),
           ObjectId
-        },
+        }
-        'logger-sharelatex': { log: sinon.stub() },
-        '@overleaf/metrics': { timeAsyncMethod: sinon.stub() }
       }
     })
     this.user_id = ObjectId().toString()

services/contacts/test/unit/js/HttpControllerTests.js

@@ -21,8 +21,7 @@ describe('HttpController', function () {
   beforeEach(function () {
     this.HttpController = SandboxedModule.require(modulePath, {
       requires: {
-        './ContactManager': (this.ContactManager = {}),
+        './ContactManager': (this.ContactManager = {})
-        'logger-sharelatex': (this.logger = { log: sinon.stub() })
       }
     })
     this.user_id = 'mock-user-id'