fix test race issues

Author: 75lb

test/caching.js

@@ -6,37 +6,39 @@ const path = require('path')
 const fs = require('fs-then-native')
 const a = require('assert')
 
-const runner = new TestRunner()
+/* needs to be sequence as `jsdoc.cache` is shared between tests */
+const runner = new TestRunner({ sequential: true })
 
-runner.test('.explainSync({ files, cache: true })', function () {
+runner.test('caching: .explainSync({ files, cache: true })', function () {
   const f = new Fixture('class-all')
   jsdoc.cache.dir = 'tmp/cache-sync'
-  jsdoc.cache.clear().catch(err => { /* ignore */ })
-  const output = jsdoc.explainSync({ files: f.sourcePath, cache: true })
-  const expectedOutput = f.getExpectedOutput(output)
+  return jsdoc.cache.clear()
+    .then(() => {
+      const output = jsdoc.explainSync({ files: f.sourcePath, cache: true })
+      const expectedOutput = f.getExpectedOutput(output)
 
-  a.ok(typeof output === 'object')
-  a.deepEqual(output, expectedOutput)
+      a.ok(typeof output === 'object')
+      a.deepEqual(output, expectedOutput)
+    })
 })
 
-runner.test('.explain({ files, cache: true  })', function () {
+runner.test('caching: .explain({ files, cache: true  })', function () {
   const f = new Fixture('class-all')
   jsdoc.cache.dir = 'tmp/cache'
-  jsdoc.cache.clear().catch(err => { /* ignore */ })
-  return jsdoc.explain({ files: f.sourcePath, cache: true })
-    .then(function (output) {
-      const cachedFiles = fs.readdirSync(jsdoc.cache.dir)
-        .map(function (file) {
-          return path.resolve(jsdoc.cache.dir, file)
+  return jsdoc.cache.clear()
+    .then(() => {
+      return jsdoc.explain({ files: f.sourcePath, cache: true })
+        .then(output => {
+          const cachedFiles = fs.readdirSync(jsdoc.cache.dir)
+            .map(file => path.resolve(jsdoc.cache.dir, file))
+          a.strictEqual(cachedFiles.length, 1)
+          a.deepEqual(output, f.getExpectedOutput(output))
+          const cachedData = JSON.parse(fs.readFileSync(cachedFiles[0], 'utf8'))
+          Fixture.removeFileSpecificData(cachedData)
+          a.deepEqual(
+            cachedData,
+            f.getExpectedOutput(output)
+          )
         })
-      a.strictEqual(cachedFiles.length, 1)
-      a.deepEqual(output, f.getExpectedOutput(output))
-      const cachedData = JSON.parse(fs.readFileSync(cachedFiles[0], 'utf8'))
-      Fixture.removeFileSpecificData(cachedData)
-      a.deepEqual(
-        cachedData,
-        f.getExpectedOutput(output)
-      )
     })
-    .catch(function (err) { console.error(err.stack) })
 })

test/render-sync.js

@@ -9,19 +9,19 @@ const a = require('assert')
 const runner = new TestRunner()
 
 runner.test('.renderSync({ files })', function () {
-  Fixture.createTmpFolder('tmp')
+  Fixture.createTmpFolder('tmp/renderSync')
   const f = new Fixture('class-all')
-  jsdoc.renderSync({ files: f.sourcePath, destination: 'tmp/out' })
+  jsdoc.renderSync({ files: f.sourcePath, destination: 'tmp/renderSync/out' })
   a.doesNotThrow(function () {
-    fs.statSync('./tmp/out/index.html')
+    fs.statSync('./tmp/renderSync/out/index.html')
   })
 })
 
 runner.test('.renderSync({ source, destination })', function () {
-  Fixture.createTmpFolder('tmp')
+  Fixture.createTmpFolder('tmp/renderSync')
   const f = new Fixture('class-all')
-  jsdoc.renderSync({ source: f.getSource(), destination: 'tmp/out' })
+  jsdoc.renderSync({ source: f.getSource(), destination: 'tmp/renderSync/out' })
   a.doesNotThrow(function () {
-    fs.statSync('./tmp/out/index.html')
+    fs.statSync('./tmp/renderSync/out/index.html')
   })
 })