From 821972b79194098bb7d03ecef2d33903dc71e131 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Wed, 17 Mar 2021 16:34:06 -0400 Subject: [PATCH] Add global test setup Configure chai and SandboxedModule in a central place and add SandboxedModule globals that are required in Node 12. --- services/notifications/.mocharc.json | 3 +++ services/notifications/test/setup.js | 21 +++++++++++++++++++ .../unit/js/NotificationsControllerTest.js | 3 --- .../test/unit/js/NotificationsTests.js | 19 +++++------------ 4 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 services/notifications/.mocharc.json create mode 100644 services/notifications/test/setup.js diff --git a/services/notifications/.mocharc.json b/services/notifications/.mocharc.json new file mode 100644 index 0000000000..dc3280aa96 --- /dev/null +++ b/services/notifications/.mocharc.json @@ -0,0 +1,3 @@ +{ + "require": "test/setup.js" +} diff --git a/services/notifications/test/setup.js b/services/notifications/test/setup.js new file mode 100644 index 0000000000..9ebe599cea --- /dev/null +++ b/services/notifications/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 } +}) diff --git a/services/notifications/test/unit/js/NotificationsControllerTest.js b/services/notifications/test/unit/js/NotificationsControllerTest.js index 7ee78b6c5b..e63b83b9fb 100644 --- a/services/notifications/test/unit/js/NotificationsControllerTest.js +++ b/services/notifications/test/unit/js/NotificationsControllerTest.js @@ -11,8 +11,6 @@ * 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 modulePath = '../../../app/js/NotificationsController.js' const SandboxedModule = require('sandboxed-module') const assert = require('assert') @@ -27,7 +25,6 @@ describe('Notifications Controller', function () { this.notifications = {} this.controller = SandboxedModule.require(modulePath, { requires: { - 'logger-sharelatex': { log() {} }, './Notifications': this.notifications, '@overleaf/metrics': { inc: sinon.stub() diff --git a/services/notifications/test/unit/js/NotificationsTests.js b/services/notifications/test/unit/js/NotificationsTests.js index 426aa706da..7d2b89a26e 100644 --- a/services/notifications/test/unit/js/NotificationsTests.js +++ b/services/notifications/test/unit/js/NotificationsTests.js @@ -13,9 +13,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ const sinon = require('sinon') -const chai = require('chai') -const expect = chai.should -const should = chai.should() +const { expect } = require('chai') const modulePath = '../../../app/js/Notifications.js' const SandboxedModule = require('sandboxed-module') const assert = require('assert') @@ -43,16 +41,9 @@ describe('Notifications Tests', function () { this.notifications = SandboxedModule.require(modulePath, { requires: { - 'logger-sharelatex': { - log() {}, - error() {} - }, 'settings-sharelatex': {}, './mongodb': { db: this.db, ObjectId }, '@overleaf/metrics': { timeAsyncMethod: sinon.stub() } - }, - globals: { - console } }) @@ -109,7 +100,7 @@ describe('Notifications Tests', function () { user_id, this.stubbedNotification, (err) => { - expect(err).not.exists + expect(err).not.to.exist sinon.assert.calledWith( this.updateOneStub, this.expectedQuery, @@ -131,7 +122,7 @@ describe('Notifications Tests', function () { user_id, this.stubbedNotification, (err) => { - expect(err).not.exists + expect(err).not.to.exist sinon.assert.notCalled(this.updateOneStub) return done() } @@ -144,7 +135,7 @@ describe('Notifications Tests', function () { user_id, this.stubbedNotification, (err) => { - expect(err).not.exists + expect(err).not.to.exist sinon.assert.calledWith( this.updateOneStub, this.expectedQuery, @@ -184,7 +175,7 @@ describe('Notifications Tests', function () { user_id, this.stubbedNotification, (err) => { - expect(err).not.exists + expect(err).not.to.exist sinon.assert.calledWith( this.updateOneStub, this.expectedQuery,