diff --git a/lib/manager/configManager.spec.js b/lib/manager/configManager.spec.js deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/manager/modManager.spec.js b/lib/manager/modManager.spec.js deleted file mode 100644 index e69de29b..00000000 diff --git a/package.json b/package.json index b217df62..58815988 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "repository": "https://github.com/clusterio/factorioClusterio", "main": "master.js", "scripts": { - "test": "mocha --exit --check-leaks -R spec \"./{,!(node_modules)/**/}*.spec.js\"", + "test": "mocha --exit --check-leaks -R spec --recursive test sharedPlugins/*/test", "fast-test": "FAST_TEST=y npm test", "cover": "nyc npm test", "fast-cover": "FAST_TEST=y nyc npm test", @@ -14,6 +14,12 @@ "install": "node lib/npmPostinstall.js", "bundle-dependencies": "bundle-dependencies" }, + "nyc": { + "exclude": [ + "test/**", + "sharedPlugins/*/test/**" + ] + }, "keywords": [ "factorio" ], diff --git a/sharedPlugins/inventoryImports/interfacingFunctions.spec.js b/sharedPlugins/inventoryImports/test/interfacingFunctions.js similarity index 99% rename from sharedPlugins/inventoryImports/interfacingFunctions.spec.js rename to sharedPlugins/inventoryImports/test/interfacingFunctions.js index 44019395..8624ec0b 100644 --- a/sharedPlugins/inventoryImports/interfacingFunctions.spec.js +++ b/sharedPlugins/inventoryImports/test/interfacingFunctions.js @@ -1,6 +1,6 @@ const assert = require("assert"); const child_process = require("child_process"); -const functions = require("./interfacingFunctions"); +const functions = require("../interfacingFunctions"); const luamin = require("luamin"); const isFactorioCommand = require("lib/isFactorioCommand"); const nock = require("nock"); diff --git a/sharedPlugins/inventoryImports/isJson.spec.js b/sharedPlugins/inventoryImports/test/isJson.js similarity index 95% rename from sharedPlugins/inventoryImports/isJson.spec.js rename to sharedPlugins/inventoryImports/test/isJson.js index db0f2657..2ee870e0 100644 --- a/sharedPlugins/inventoryImports/isJson.spec.js +++ b/sharedPlugins/inventoryImports/test/isJson.js @@ -1,4 +1,4 @@ -const isJson = require("./isJson"); +const isJson = require("../isJson"); const assert = require("assert"); describe("inventoryImports/isJson.js()", function(){ diff --git a/sharedPlugins/researchSync/index.spec.js b/sharedPlugins/researchSync/test/index.js similarity index 98% rename from sharedPlugins/researchSync/index.spec.js rename to sharedPlugins/researchSync/test/index.js index 86a55552..aa0b9a6c 100644 --- a/sharedPlugins/researchSync/index.spec.js +++ b/sharedPlugins/researchSync/test/index.js @@ -3,7 +3,7 @@ const nock = require("nock"); const isFactorioCommand = require("lib/isFactorioCommand"); -const researchSync = require("./index.js"); +const researchSync = require("../index.js"); describe("researchSync/index.js", function() { it("exports a single class (or at least a function)", function() { diff --git a/client.spec.js b/test/client.js similarity index 96% rename from client.spec.js rename to test/client.js index f02d8a03..ae5dce13 100644 --- a/client.spec.js +++ b/test/client.js @@ -1,6 +1,6 @@ const assert = require('assert').strict; -const client = require("./client"); +const client = require("../client"); describe("Client testing", function() { describe("randomDynamicPort()", function() { diff --git a/lib/database.spec.js b/test/lib/database.js similarity index 100% rename from lib/database.spec.js rename to test/lib/database.js diff --git a/lib/factorioServer/index.spec.js b/test/lib/factorioServer/index.js similarity index 98% rename from lib/factorioServer/index.spec.js rename to test/lib/factorioServer/index.js index ce62386f..0203449d 100644 --- a/lib/factorioServer/index.spec.js +++ b/test/lib/factorioServer/index.js @@ -5,7 +5,7 @@ const path = require("path"); const parallel = require("mocha.parallel"); const mkdirp = require("mkdirp"); -const factorioServer = require("./index.js"); +const factorioServer = require("lib/factorioServer"); describe("class factorioServer/index.js", ()=>{ it("is a class (or at least a function)", ()=>{ diff --git a/lib/fileOps/fileOps.spec.js b/test/lib/fileOps/fileOps.js similarity index 99% rename from lib/fileOps/fileOps.spec.js rename to test/lib/fileOps/fileOps.js index b3d731dd..7b9a66aa 100644 --- a/lib/fileOps/fileOps.spec.js +++ b/test/lib/fileOps/fileOps.js @@ -2,7 +2,7 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); -const fileOps = require('./fileOps'); +const fileOps = require('lib/fileOps'); // create folders for testing function setupTestingEnv(){ diff --git a/lib/generateSSLcert.spec.js b/test/lib/generateSSLcert.js similarity index 100% rename from lib/generateSSLcert.spec.js rename to test/lib/generateSSLcert.js diff --git a/lib/getFactorioLocale.spec.js b/test/lib/getFactorioLocale.js similarity index 97% rename from lib/getFactorioLocale.spec.js rename to test/lib/getFactorioLocale.js index a9ba1f3b..043d32c7 100644 --- a/lib/getFactorioLocale.spec.js +++ b/test/lib/getFactorioLocale.js @@ -1,7 +1,7 @@ const assert = require("assert"); const util = require("util"); -const getFactorioLocale = require("./getFactorioLocale"); +const getFactorioLocale = require("lib/getFactorioLocale"); const asObjectAsync = util.promisify(getFactorioLocale.asObject); describe("getFactorioLocale.js", function() { diff --git a/lib/isFactorioCommand/isFactorioCommand.spec.js b/test/lib/isFactorioCommand/isFactorioCommand.js similarity index 94% rename from lib/isFactorioCommand/isFactorioCommand.spec.js rename to test/lib/isFactorioCommand/isFactorioCommand.js index bc3ac232..8faa141c 100644 --- a/lib/isFactorioCommand/isFactorioCommand.spec.js +++ b/test/lib/isFactorioCommand/isFactorioCommand.js @@ -1,4 +1,4 @@ -const isFactorioCommand = require("./isFactorioCommand"); +const isFactorioCommand = require("lib/isFactorioCommand"); const assert = require("assert"); describe("inventoryImports/isFactorioCommand.js()", function(){ diff --git a/lib/objectOps.spec.js b/test/lib/objectOps.js similarity index 96% rename from lib/objectOps.spec.js rename to test/lib/objectOps.js index c10a00a9..5e591776 100644 --- a/lib/objectOps.spec.js +++ b/test/lib/objectOps.js @@ -1,5 +1,5 @@ var assert = require('assert'); -var objectOps = require('./objectOps'); +var objectOps = require('lib/objectOps'); describe("objectOps.js", function(){ /*describe("objectOps.clone()", function(){ diff --git a/lib/stringUtils.spec.js b/test/lib/stringUtils.js similarity index 97% rename from lib/stringUtils.spec.js rename to test/lib/stringUtils.js index f16f19ca..03760e08 100644 --- a/lib/stringUtils.spec.js +++ b/test/lib/stringUtils.js @@ -1,5 +1,5 @@ const assert = require("assert"); -const stringUtils = require("./stringUtils"); +const stringUtils = require("lib/stringUtils"); describe("stringUtils.js", function(){ describe("hashCode", function(){ diff --git a/master.spec.js b/test/master.js similarity index 99% rename from master.spec.js rename to test/master.js index 41d0874a..8153ec7d 100644 --- a/master.spec.js +++ b/test/master.js @@ -4,7 +4,7 @@ const validateHTML = require('html5-validator'); const parallel = require('mocha.parallel'); const jwt = require("jsonwebtoken"); -const master = require('./master.js'); +const master = require('../master.js'); const authenticate = require('lib/authenticate'); const database = require('lib/database');