Move test/temp to temp/test

Move the temporary files generated by the the tests to the top level
directory temp.

.gitignore

@@ -42,7 +42,7 @@ static/pictures/spritesheet.js
 static/pictures/spritesheet.png
 static/external
 saves
-/test/temp/
+/temp/
 
 # weird pattern to ignore sharedPlugins except not ignore some core modules
 !sharedPlugins/

.travis.yml

@@ -7,5 +7,5 @@ before_install:
   - npm install -g codecov
 script:
   - npm run-script ci-cover
-  - cat test/temp/integration/log.txt
+  - cat temp/test/integration/log.txt
   - codecov -f coverage/lcov.info

test/integration/index.js

@@ -32,11 +32,11 @@ let slaveProcess;
 
 let url = "https://localhost:4443/";
 let token = jwt.sign({ id: "api" }, "TestSecretDoNotUse");
-let instancesDir = path.join("test", "temp", "instances");
-let databaseDir = path.join("test", "temp", "databse");
-let masterConfigPath = path.join("test", "temp", "master-integration.json");
-let slaveConfigPath = path.join("test", "temp", "slave-integration.json");
-let controlConfigPath = path.join("test", "temp", "control-integration.json");
+let instancesDir = path.join("temp", "test", "instances");
+let databaseDir = path.join("temp", "test", "databse");
+let masterConfigPath = path.join("temp", "test", "master-integration.json");
+let slaveConfigPath = path.join("temp", "test", "slave-integration.json");
+let controlConfigPath = path.join("temp", "test", "control-integration.json");
 
 async function exec(...args) {
 	console.log(args[0]);

test/integration/patch.js

@@ -13,7 +13,7 @@ require("./server")
 
 describe("Integration of lib/factorio/patch", function() {
 	describe("patch()", function() {
-		let savePath = path.join("test", "temp", "integration", "saves", "test.zip");
+		let savePath = path.join("temp", "test", "integration", "saves", "test.zip");
 		it("should patch a freeplay game", async function() {
 			slowTest(this);
 			await factorio.patch(savePath, [{

test/integration/server.js

@@ -20,7 +20,7 @@ describe("Integration of lib/factorio/server", function() {
 	});
 
 	describe("class FactorioServer", function() {
-		let writePath = path.join("test", "temp", "integration");
+		let writePath = path.join("temp", "test", "integration");
 		let server = new factorio.FactorioServer("factorio", writePath, {});
 		let logFile;
 

test/lib/database.js

@@ -1,5 +1,6 @@
 const assert = require("assert").strict;
 const fs = require("fs-extra");
+const path = require("path");
 
 const database = require("lib/database");
 
@@ -60,7 +61,7 @@ describe("lib/database", function() {
 
 	describe("saveMapAsJson()", function() {
 		it("should save a mapping as JSON", async function() {
-			let testFile = 'test/temp/save_map.json';
+			let testFile = path.join("temp", "test", "save_map.json");
 			async function deleteTestFile() {
 				try {
 					await fs.unlink(testFile);
@@ -134,7 +135,7 @@ describe("lib/database", function() {
 
 	describe("saveMapAsJsonArray()", function() {
 		it("should save a mapping as JSON", async function() {
-			let testFile = 'test/temp/save_array_map.json';
+			let testFile = path.join("temp", "test", "save_array_map.json");
 			async function deleteTestFile() {
 				try {
 					await fs.unlink(testFile);

test/lib/factorio/patch.js

@@ -212,7 +212,7 @@ describe("lib/factorio", function() {
 		it("should throw on unknown scenario", async function() {
 			let zip = new jszip();
 			zip.file("world/control.lua", "-- unknown\n");
-			let zipPath = path.join("test", "temp", "patch.zip");
+			let zipPath = path.join("temp", "test", "patch.zip");
 			await fs.outputFile(zipPath, await zip.generateAsync({type: "nodebuffer"}))
 
 			await assert.rejects(

test/lib/factorio/server.js

@@ -166,7 +166,7 @@ describe("lib/factorio/server", function() {
 	});
 
 	describe("class FactorioServer", function() {
-		let writePath = path.join("test", "temp", "should_not_exist");
+		let writePath = path.join("temp", "test", "server");
 		let server = new factorio.FactorioServer(path.join("test", "file", "factorio"), writePath, {});
 
 		describe(".init()", function() {

test/lib/fileOps/fileOps.js

@@ -5,7 +5,7 @@ const path = require('path');
 const fileOps = require('lib/fileOps');
 
 describe("fileOps.js", function(){
-	let baseDir = path.join("test", "temp", "fileOps");
+	let baseDir = path.join("temp", "test", "fileOps");
 	async function setupTestingEnv() {
 		await fs.ensureDir(path.join(baseDir, "test", "folder"));
 		await fs.ensureDir(path.join(baseDir, "test", "another folder"));

test/lib/generateSSLcert.js

@@ -5,7 +5,7 @@ const path = require("path");
 const generateSSLcert = require("lib/generateSSLcert")
 
 describe("generateSSLcert.js(options)", ()=>{
-	let testDir = "test/temp/certTest";
+	let testDir = path.join("temp", "test", "certTest");
 	before(async function() {
 		await fs.remove(testDir);
 	});

test/lib/plugin.js

@@ -35,7 +35,7 @@ describe("lib/plugin", function() {
 	});
 
 	describe("loadPluginInfos()", function() {
-		let baseDir = path.join('test', 'temp', 'plugin');
+		let baseDir = path.join("temp", "test", "plugin");
 		let emptyDir = path.join(baseDir, 'emptyDir');
 		let emptyPlugin = path.join(baseDir, 'emptyPlugin');
 		let testPlugin = path.join(baseDir, 'testPlugin');

test/slave.js

@@ -89,7 +89,7 @@ describe("Slave testing", function() {
 	});
 
 	describe("symlinkMods()", function() {
-		let testDir = path.join("test", "temp", "symlink");
+		let testDir = path.join("temp", "test", "symlink");
 		let discardingLogger = {
 			warning: function() { },
 			log: function() { },