isTest() in decorators

package.json

@@ -41,8 +41,8 @@
 		"postinstall": "bash scripts/postinstall.sh && NODE_ENV=production node ./src/main.js init",
 		"lint": "./node_modules/.bin/eslint \"**/*.js\"",
 		"automatic-release": "automatic-release",
-        "test": "NODE_ENV=test mocha",
-        "coverage": "NODE_ENV=test nyc mocha"
+		"test": "NODE_ENV=test mocha",
+		"coverage": "NODE_ENV=test nyc mocha"
 	},
 	"preferGlobal": true,
 	"bin": {
@@ -81,14 +81,14 @@
 	},
 	"devDependencies": {
 		"automatic-release": "^1.1.1",
-        "bdd-lazy-var": "^2.5.0",
-        "chai": "^4.2.0",
-        "chai-as-promised": "^7.1.1",
-        "chai-http": "^4.2.0",
-        "eslint": "^5.6.1",
-        "mocha": "^5.2.0",
-        "nyc": "^13.1.0",
-        "sinon": "^7.1.1",
-        "sinon-chai": "^3.2.0"
+		"bdd-lazy-var": "^2.5.0",
+		"chai": "^4.2.0",
+		"chai-as-promised": "^7.1.1",
+		"chai-http": "^4.2.0",
+		"eslint": "^5.6.1",
+		"mocha": "^5.2.0",
+		"nyc": "^13.1.0",
+		"sinon": "^7.1.1",
+		"sinon-chai": "^3.2.0"
 	}
 }

src/controllers/tunnel-controller.js

@@ -45,6 +45,6 @@ const getTunnelEndPoint = async function (req, user) {
 };
 
 module.exports = {
-  manageTunnelEndPoint: isTest() ? manageTunnelEndPoint : AuthDecorator.checkAuthToken(manageTunnelEndPoint),
-  getTunnelEndPoint: isTest() ? getTunnelEndPoint : AuthDecorator.checkAuthToken(getTunnelEndPoint),
+  manageTunnelEndPoint: AuthDecorator.checkAuthToken(manageTunnelEndPoint),
+  getTunnelEndPoint: AuthDecorator.checkAuthToken(getTunnelEndPoint),
 };

src/decorators/authorization-decorator.js

@@ -17,9 +17,13 @@ const AccessTokenManager = require('../sequelize/managers/access-token-manager')
 const FogManager = require('../sequelize/managers/iofog-manager')
 const FogAccessTokenManager = require('../sequelize/managers/iofog-access-token-manager')
 const Errors = require('../helpers/errors')
+const { isTest } = require('../helpers/app-helper');
 
 function checkAuthToken(f) {
   return async function() {
+    if (isTest()) {
+      return await f.apply(this, arguments);
+    }
 
     const fArgs = Array.prototype.slice.call(arguments);
     const req = fArgs[0];
@@ -46,6 +50,9 @@ function checkAuthToken(f) {
 
 function checkFogToken(f) {
   return async function() {
+    if (isTest()) {
+      return await f.apply(this, arguments);
+    }
 
     const fArgs = Array.prototype.slice.call(arguments);
     const req = fArgs[0];

src/decorators/cli-decorator.js

@@ -16,9 +16,13 @@ const config = require('../config');
 const UserManager = require('../sequelize/managers/user-manager');
 const AccessTokenManager = require('../sequelize/managers/access-token-manager');
 const Errors = require('../helpers/errors');
+const { isTest } = require('../helpers/app-helper');
 
 function prepareUserById(f) {
   return async function() {
+    if (isTest()) {
+      return await f.apply(this, arguments);
+    }
 
     const fArgs = Array.prototype.slice.call(arguments)
     const obj = fArgs[0]
@@ -42,6 +46,9 @@ function prepareUserById(f) {
 
 function prepareUserByEmail(f) {
   return async function() {
+    if (isTest()) {
+      return await f.apply(this, arguments);
+    }
 
     const fArgs = Array.prototype.slice.call(arguments)
     const obj = fArgs[0]

src/decorators/response-decorator.js

@@ -11,9 +11,13 @@
  *
  */
 const logger = require('../logger');
+const { isTest } = require('../helpers/app-helper');
 
 function handleErrors(f, successCode, errorsCodes) {
   return async function() {
+    if (isTest()) {
+      return await f.apply(this, arguments);
+    }
 
     let responseObject = {};
     try {

src/decorators/transaction-decorator.js

@@ -15,9 +15,14 @@ const db = require('./../sequelize/models');
 const retry = require('retry-as-promised');
 const sequelize = db.sequelize;
 const Transaction = require('sequelize/lib/transaction');
+const { isTest } = require('../helpers/app-helper');
 
 function transaction(f) {
   return async function() {
+    if (isTest()) {
+      return await f.apply(this, arguments);
+    }
+
     const fArgs = Array.prototype.slice.call(arguments);
     //TODO [when transactions concurrency issue fixed]: Remove 'fArgs[fArgs.length - 1].fakeTransaction'
     if (fArgs.length > 0 && (fArgs[fArgs.length - 1] instanceof Transaction || fArgs[fArgs.length - 1].fakeTransaction)) {
@@ -51,6 +56,10 @@ function generateTransaction(f) {
 function fakeTransaction(f) {
   const fakeTransactionObject = {fakeTransaction: true}
   return async function() {
+    if (isTest()) {
+      return await f.apply(this, arguments);
+    }
+
     const fArgs = Array.prototype.slice.call(arguments);
     if (fArgs.length > 0 && fArgs[fArgs.length - 1] instanceof Transaction) {
       fArgs[fArgs.length - 1] = fakeTransactionObject;

src/helpers/app-helper.js

@@ -105,6 +105,9 @@ function generateAccessToken() {
 }
 
 function checkTransaction(transaction) {
+  if (isTest()) {
+    return
+  }
   //TODO [when transactions concurrency issue fixed]: Remove '!transaction.fakeTransaction'
   if (!transaction || (!(transaction instanceof Transaction) && !transaction.fakeTransaction)) {
     throw new Errors.TransactionError()

src/services/tunnel-service.js

@@ -74,8 +74,8 @@ const closeTunnel = async function (tunnelData, user, transaction) {
 };
 
 module.exports = {
-  findTunnel: AppHelper.isTest() ? findTunnel : TransactionDecorator.generateTransaction(findTunnel),
-  openTunnel: AppHelper.isTest() ? openTunnel : TransactionDecorator.generateTransaction(openTunnel),
-  closeTunnel: AppHelper.isTest() ? closeTunnel : TransactionDecorator.generateTransaction(closeTunnel),
-  findAll: AppHelper.isTest() ? findAll : TransactionDecorator.generateTransaction(findAll),
+  findTunnel: TransactionDecorator.generateTransaction(findTunnel),
+  openTunnel: TransactionDecorator.generateTransaction(openTunnel),
+  closeTunnel: TransactionDecorator.generateTransaction(closeTunnel),
+  findAll: TransactionDecorator.generateTransaction(findAll),
 };