Refactor so calls to 7daystodie-api-wrapper can be tested (#77)

api/hooks/sdtdLogs/logProcessor.js

@@ -20,7 +20,7 @@ module.exports = async function(job) {
 
   // If latest log line is not found, get it from the server
   if (!lastLogLine) {
-    const webUIUpdate = await module.exports.getWebUIUpdates(job.data.server);
+    const webUIUpdate = await sails.helpers.sdtdApi.getWebUIUpdates(job.data.server);
     lastLogLine = parseInt(webUIUpdate.newlogs) + 1;
   }
 
@@ -29,7 +29,7 @@ module.exports = async function(job) {
     : 50;
 
   // Get new logs from the server
-  const newLogs = await module.exports.getLog(job.data.server, lastLogLine, count);
+  const newLogs = await sails.helpers.sdtdApi.getLog(job.data.server, lastLogLine, count);
 
   // Adjust latest log line based on new logs we got
   lastLogLine = lastLogLine + newLogs.entries.length;
@@ -69,6 +69,3 @@ module.exports = async function(job) {
     logs: resultLogs
   });
 };
-module.exports.getWebUIUpdates = SdtdApi.getWebUIUpdates;
-module.exports.getLog = SdtdApi.getLog;
-

config/bootstrap.js

@@ -1,3 +1,4 @@
+const SdtdApi = require("7daystodie-api-wrapper");
 /**
  * Bootstrap
  * (sails.config.bootstrap)
@@ -10,6 +11,11 @@
  */
 
 module.exports.bootstrap = async function (done) {
+  sails.helpers.sdtdApi = {};
+  for (const func of Object.keys(SdtdApi)) {
+    sails.helpers.sdtdApi[func] = SdtdApi[func];
+  }
+
   if (process.env.IS_TEST) {
     sails.cache = new Object();
     return done();

package.json

@@ -77,6 +77,7 @@
     "nodemon": "^2.0.3",
     "nyc": "^15.0.1",
     "sails-disk": "^1.1.2",
+    "sinon": "^9.0.2",
     "supertest": "^3.3.0"
   },
   "mocha": {

test/integration/hooks/sdtdLogs/logProcessor.test.js

@@ -1,29 +1,16 @@
 const expect = require("chai").expect;
+const sinon = require('sinon');
 const logProcessor = require("../../../../api/hooks/sdtdLogs/logProcessor");
 
-const origGetWebUIUpdates = logProcessor.getWebUIUpdates;
-const origGetLog = logProcessor.getLog;
-
 describe('logProcessor', function () {
-  beforeEach(() => {
-    sails.cache = {};
-    if (!logProcessor.getWebUIUpdates) {
-      throw new Error('Fix test, function is undefined');
-    }
-    logProcessor.getWebUIUpdates = origGetWebUIUpdates;
-    if (!logProcessor.getLog) {
-      throw new Error('Fix test, function is undefined');
-    }
-    logProcessor.getLog = origGetLog;
-  });
-  it('should return an  array', async function () {
+  it('Confirm able to fetch log messages', async function () {
     sails.cache[`sdtdserver:${sails.testServer.id}:sdtdLogs:lastLogLine`] = 1100;
-    logProcessor.getWebUIUpdates = async function() {
+    sinon.stub(sails.helpers.sdtdApi, "getWebUIUpdates").callsFake(async function() {
       return {
         newlogs: 1100
       }
-    };
-    logProcessor.getLog = async function() {
+    });
+    sinon.stub(sails.helpers.sdtdApi, "getLog").callsFake(async function() {
       return {
         firstLine: 1100,
         lastLine: 1150,
@@ -46,7 +33,7 @@ describe('logProcessor', function () {
           }
         ],
       }
-    };
+    });
     const ret = await logProcessor({
       data: {
         server: {

test/lifecycle.test.js

@@ -1,6 +1,7 @@
 const sails = require('sails');
 const faker = require('faker');
 const MockDate = require('mockdate');
+const sinon = require('sinon')
 
 process.env.IS_TEST = true;
 process.env.NODE_ENV = 'test';
@@ -10,6 +11,15 @@ delete process.env.REDISSTRING;
 beforeEach(function() {
   MockDate.set('2020-05-01T01:20:05+0000');
 });
+before(() => {
+  global.sandbox = sinon.createSandbox()
+})
+beforeEach(() => {
+  global.sandbox.restore()
+})
+beforeEach(() => {
+  sails.cache = {};
+});
 // Before running any tests...
 before(function (done) {