diff --git a/lib/fileOps.spec.js b/lib/fileOps.spec.js index 77ffb249..b9eda49c 100644 --- a/lib/fileOps.spec.js +++ b/lib/fileOps.spec.js @@ -3,26 +3,29 @@ var fileOps = require('./fileOps'); var fs = require('fs'); // create folders for testing -if (!fs.existsSync("lib/test")){ - fs.mkdirSync("lib/test"); +function setupTestingEnv(){ + if (!fs.existsSync("lib/test")){ + fs.mkdirSync("lib/test"); + } + if (!fs.existsSync("lib/test/folder")){ + fs.mkdirSync("lib/test/folder"); + } + if (!fs.existsSync("lib/test/another folder")){ + fs.mkdirSync("lib/test/another folder"); + } + if (!fs.existsSync("lib/test/file.txt")){ + fs.writeFileSync("lib/test/file.txt", "contents"); + } + if (!fs.existsSync("lib/test/another file.txt")){ + fs.writeFileSync("lib/test/another file.txt", "more contents"); + } + // we need this xfile to test a branch in fileOps.getNewestFile()s propagation + if (!fs.existsSync("lib/test/xfile.txt")){ + fs.writeFileSync("lib/test/xfile.txt", "contents"); + } } -if (!fs.existsSync("lib/test/folder")){ - fs.mkdirSync("lib/test/folder"); -} -if (!fs.existsSync("lib/test/another folder")){ - fs.mkdirSync("lib/test/another folder"); -} -if (!fs.existsSync("lib/test/file.txt")){ - fs.writeFileSync("lib/test/file.txt", "contents"); -} -if (!fs.existsSync("lib/test/another file.txt")){ - fs.writeFileSync("lib/test/another file.txt", "more contents"); -} -// we need this xfile to test a branch in fileOps.getNewestFile()s propagation -if (!fs.existsSync("lib/test/xfile.txt")){ - fs.writeFileSync("lib/test/xfile.txt", "contents"); -} - +setupTestingEnv(); +setupTestingEnv(); // run twice to get branch coverage describe("fileOps.js", function(){ describe("fileOps.getDirectoriesSync()", function(){ it("gets an array of directory names from a path", function(){ diff --git a/sharedPlugins/inventoryImports/isJson.spec.js b/sharedPlugins/inventoryImports/isJson.spec.js index 4f76fe48..ece8c324 100644 --- a/sharedPlugins/inventoryImports/isJson.spec.js +++ b/sharedPlugins/inventoryImports/isJson.spec.js @@ -5,7 +5,7 @@ describe("isJson.js()", function(){ it("checks if a thing is valid JSON", function(){ assert(isJson("string") === false); assert(isJson("{js_object_notation='very false'}") === false); - assert(isJson('{ "name":"John", "age":31, "city":"New York" }') === true); + assert(isJson('{ "name":"John", "age":31, "city":"New York" }') === true, "This is valid JSON, lib disagrees"); }); it("recognizes that true and false are both valid JSON", function(){ assert(isJson(true) === true); @@ -15,6 +15,6 @@ describe("isJson.js()", function(){ assert(isJson(null) === true); }); it("Recognizes that JSON doesn't allow trailing commas (,)", function(){ - assert(isJson('["a", "b", ]') === false); + assert(isJson('["a", "b", ]') === false, "JSON should not allow trailing commas"); }); });