chore(test): cleanup scope usage

EME-5173

Co-authored-by: Gabor Nemeth <[email protected]>

Author: sonicoder86

src/enabled/enabled.spec.js

@@ -1,4 +1,5 @@
 const { isNamespaceEnabled } = require('./enabled');
+const { expect } = require('chai');
 
 describe('isNamespaceAvailable', function() {
   it('should enable when variables only contain one', function() {

src/formatter/json.spec.js

@@ -1,3 +1,4 @@
+const { expect } = require('chai');
 const { jsonFormatter } = require('./json');
 
 describe('json formatter', function() {

src/formatter/logentries.spec.js

@@ -1,3 +1,4 @@
+const { expect } = require('chai');
 const { logentriesFormatter } = require('./logentries');
 
 describe('logentries formatter', function() {

src/index.spec.js

@@ -1,3 +1,4 @@
+const { expect } = require('chai');
 const { createLogger, Logger } = require('./index');
 
 describe('createLogger', function() {

src/logger/logger.spec.js

@@ -1,13 +1,17 @@
+const { expect } = require('chai');
+const sinon = require('sinon');
 const { Logger } = require('./logger');
 const { jsonFormatter } = require('../formatter/json');
 const { consoleOutput } = require('../output/console');
 
 describe('Logger', function() {
   let logger;
+  let clock;
 
   beforeEach(function() {
     logger = new Logger('mongo', true);
-    this.sandbox.stub(Logger.config, 'output');
+    sinon.stub(Logger.config, 'output');
+    clock = sinon.useFakeTimers();
   });
 
   afterEach(function() {
@@ -16,6 +20,7 @@ describe('Logger', function() {
       output: consoleOutput,
       transformers: []
     });
+    clock.restore();
   });
 
   it('should call log info method when enabled', function() {
@@ -48,9 +53,9 @@ describe('Logger', function() {
   it('should not call log info method when disabled', function() {
     logger = new Logger('mongo', false);
     const timer = logger.timer();
-    const infoStub = this.sandbox.stub(logger, 'info');
+    const infoStub = sinon.stub(logger, 'info');
 
-    this.clock.tick(100);
+    clock.tick(100);
     timer.info('hi');
 
     expect(infoStub).to.have.been.calledWith('hi', { duration: 100 });
@@ -253,7 +258,7 @@ describe('Logger', function() {
   describe('#configure', function() {
     it('should change format method', function() {
       const formattedOutput = '{"my":"method"}';
-      const formatterStub = this.sandbox.stub();
+      const formatterStub = sinon.stub();
       formatterStub.returns(formattedOutput);
 
       Logger.configure({
@@ -266,7 +271,7 @@ describe('Logger', function() {
     });
 
     it('should change output method', function() {
-      const outputStub = this.sandbox.stub();
+      const outputStub = sinon.stub();
       Logger.configure({
         output: outputStub
       });

src/setup.spec.js

@@ -1,19 +1,9 @@
 const sinon = require('sinon');
 const chai = require('chai');
 const sinonChai = require('sinon-chai');
-global.expect = require('chai').expect;
 
 chai.use(sinonChai);
-global.expect = chai.expect;
 
-beforeEach(function() {
-  this.sandbox = sinon.createSandbox();
-  this.clock = sinon.useFakeTimers();
-});
-
-afterEach(function() {
-  this.sandbox.restore();
-  this.sandbox = undefined;
-  this.clock.restore();
-  this.clock = undefined;
+afterEach(() => {
+  sinon.restore();
 });

src/timer/timer.spec.js

@@ -1,39 +1,51 @@
+const { expect } = require('chai');
+const sinon = require('sinon');
 const { Logger } = require('../logger/logger');
 const { Timer } = require('./timer');
 
 describe('Timer', function() {
+  let clock;
+
+  beforeEach(() => {
+    clock = sinon.useFakeTimers();
+  });
+
+  afterEach(() => {
+    clock.restore();
+  });
+
   it('should log elapsed time', function() {
     const logger = new Logger('test', false);
-    const infoStub = this.sandbox.stub(logger, 'info');
+    const infoStub = sinon.stub(logger, 'info');
     const timer = new Timer(logger);
 
-    this.clock.tick(100);
+    clock.tick(100);
     timer.info('time', { customer_id: 10 });
 
     expect(infoStub).to.have.been. calledWith('time', { customer_id: 10, duration: 100 });
   });
 
   it('should log elapsed time with error', function() {
     const logger = new Logger('test', false);
-    const errorStub = this.sandbox.stub(logger, 'fromError');
+    const errorStub = sinon.stub(logger, 'fromError');
     const timer = new Timer(logger);
     const error = new Error('intended');
 
-    this.clock.tick(100);
+    clock.tick(100);
     timer.fromError('time', error, { customer_id: 10 });
 
     expect(errorStub).to.have.been. calledWith('time', error, { customer_id: 10, duration: 100 });
   });
 
   it('should log elapsed time with error', function() {
     const logger = new Logger('test', false);
-    const errorStub = this.sandbox.stub(logger, 'warnFromError');
+    const errorStub = sinon.stub(logger, 'warnFromError');
     const timer = new Timer(logger);
     const error = new Error('intended');
 
-    this.clock.tick(100);
+    clock.tick(100);
     timer.warnFromError('time', error, { customer_id: 10 });
 
-    expect(errorStub).to.have.been. calledWith('time', error, { customer_id: 10, duration: 100 });
+    expect(errorStub).to.have.been.calledWith('time', error, { customer_id: 10, duration: 100 });
   });
 });