still trying to fix paths

This commit is contained in:
Danielv123 committed 2018-03-29 19:31:56 +02:00
1 parent 9a0ce97746
commit dfa5d9ad16
3 files changed
+20 -8

No files matched your search

+10 -5
View File
@@ -12,8 +12,10 @@ This class has the responsiblity of :
const fs = require("fs");
const child_process = require("child_process");
const path = require("path");
const mkdirp = require("mkdirp");
const appRootPath = require("app-root-path");
const fileOps = require("_app/fileOps");
@@ -125,12 +127,15 @@ module.exports = class factorioServer {
await createInstance();
}
this.onProgress("log", "Starting map creation");
console.log(this.factorioDirectory + '/bin/x64/factorio')
let code = child_process.spawnSync(
this.factorioDirectory + '/bin/x64/factorio', [
'-c', this.instanceDirectory + '/config.ini',
'--create', this.instanceDirectory + '/saves/'+name,
'--server-settings', this.instanceDirectory + '/server-settings.json',
]
path.resolve(this.factorioDirectory, 'bin', 'x64', 'factorio'), [
'-c', path.resolve(this.instanceDirectory,'config.ini'),
'--create', path.resolve(this.instanceDirectory, 'saves',name),
'--server-settings', path.resolve(this.instanceDirectory, 'server-settings.json'),
],{
cwd:process.cwd(),
}
);
console.log(code.stdout.toString("utf8"))
console.log(code)
+9 -3
View File
@@ -2,6 +2,8 @@ const assert = require("assert");
const fs = require("fs");
const path = require("path");
const appRootPath = require("app-root-path");
const factorioServer = require("./index.js");
describe("factorioServer/index.js", ()=>{
@@ -53,15 +55,19 @@ describe("factorioServer/index.js", ()=>{
});
describe(".createMap()", ()=>{
it("creates a map file as instanceDirectory/saves/map.zip", async ()=>{
let relativePath = __dirname.replace(appRootPath, "").substr(1);
let server = new factorioServer({
instanceDirectory: path.resolve(__dirname, "_testData_createMap"),
instanceDirectory: path.resolve(appRootPath+"", relativePath, "_testData_createMap"),
instanceName: "Unit testing instance",
});
await server.initialize();
let maps = fs.readdirSync(path.resolve(__dirname, "_testData_createMap", "saves"));
console.log(appRootPath+"")
console.log(relativePath)
console.log(path.resolve(appRootPath+"", relativePath, "_testData_createMap", "saves"))
let maps = fs.readdirSync(path.resolve(appRootPath+"", relativePath, "_testData_createMap", "saves"));
assert.equal(maps.length, 0);
await server.createMap();
let maps2 = fs.readdirSync(path.resolve(__dirname, "_testData_createMap", "saves"));
let maps2 = fs.readdirSync(path.resolve(appRootPath+"", relativePath, "_testData_createMap", "saves"));
assert(maps2.includes("map.zip"));
server.deleteInstance();