fix: remove callbacks

Author: brianleroux

test/integration/static/index-test.js

@@ -1,17 +1,13 @@
-const { test, after } = require('node:test')
+const { test } = require('node:test')
 const assert = require('node:assert/strict')
-const { join } = require('path')
+const { join, dirname } = require('path')
 const { mkdtempSync, mkdirSync, writeFileSync, rmSync } = require('fs')
 const { tmpdir } = require('os')
 const inventory = require('@architect/inventory')
 const { updater } = require('@architect/utils')
 
-let tmpDirs = []
-
 function createTmpDir (structure) {
   const tmpDir = mkdtempSync(join(tmpdir(), 'arc-test-'))
-  tmpDirs.push(tmpDir)
-  const { dirname } = require('path')
 
   function createStructure (base, obj) {
     for (const [ key, value ] of Object.entries(obj)) {
@@ -33,16 +29,14 @@ function createTmpDir (structure) {
   return tmpDir
 }
 
-after(() => {
-  tmpDirs.forEach(dir => {
-    try {
-      rmSync(dir, { recursive: true, force: true })
-    }
-    catch {
-      // Ignore cleanup errors
-    }
-  })
-})
+function cleanupTmpDir (dir) {
+  try {
+    rmSync(dir, { recursive: true, force: true })
+  }
+  catch {
+    // Ignore cleanup errors
+  }
+}
 
 let published
 function publish (params, callback) {
@@ -105,99 +99,139 @@ test('Set up env', () => {
   assert.ok(staticDeployMod, 'Static asset deployment module is present')
 })
 
-test(`Skip static deploy if @static isn't defined`, (t, done) => {
+test(`Skip static deploy if @static isn't defined`, async () => {
   setup()
   let arc = '@app\n an-app'
   let cwd = createTmpDir({ 'app.arc': arc })
-  staticDeploy(cwd, err => {
-    if (err) assert.fail(err)
-    assert.ok(!published, 'Publish not called')
-    done()
+  await new Promise((resolve, reject) => {
+    staticDeploy(cwd, err => {
+      cleanupTmpDir(cwd)
+      if (err) reject(err)
+      else {
+        assert.ok(!published, 'Publish not called')
+        resolve()
+      }
+    })
   })
 })
 
-test(`Static deploy exits gracefully if @http is defined, but public/ folder is not present`, (t, done) => {
+test(`Static deploy exits gracefully if @http is defined, but public/ folder is not present`, async () => {
   setup()
   let arc = '@app\n an-app\n @http'
   let cwd = createTmpDir({ 'app.arc': arc })
-  staticDeploy(cwd, err => {
-    if (err) assert.fail(err)
-    assert.ok(!published, 'Publish not called')
-    done()
+  await new Promise((resolve, reject) => {
+    staticDeploy(cwd, err => {
+      cleanupTmpDir(cwd)
+      if (err) reject(err)
+      else {
+        assert.ok(!published, 'Publish not called')
+        resolve()
+      }
+    })
   })
 })
 
-test(`Publish static deploy if @static is defined`, (t, done) => {
+test(`Publish static deploy if @static is defined`, async () => {
   setup()
   let arc = '@app\n an-app\n @static'
   let cwd = createTmpDir({
     'app.arc': arc,
     'public': {},
   })
-  staticDeploy(cwd, err => {
-    if (err) assert.fail(err)
-    assert.strictEqual(published.Bucket, params.bucket, 'Bucket is unchanged')
-    assert.strictEqual(published.prefix, null, 'Prefix set to null by default')
-    assert.strictEqual(published.prune, null, 'Prune set to null by default')
-    assert.strictEqual(published.region, params.region, 'Region is unchaged')
-    done()
+  await new Promise((resolve, reject) => {
+    staticDeploy(cwd, err => {
+      cleanupTmpDir(cwd)
+      if (err) reject(err)
+      else {
+        assert.strictEqual(published.Bucket, params.bucket, 'Bucket is unchanged')
+        assert.strictEqual(published.prefix, null, 'Prefix set to null by default')
+        assert.strictEqual(published.prune, null, 'Prune set to null by default')
+        assert.strictEqual(published.region, params.region, 'Region is unchaged')
+        resolve()
+      }
+    })
   })
 })
 
-test(`Publish static deploy if @http is defined and public/ folder is present`, (t, done) => {
+test(`Publish static deploy if @http is defined and public/ folder is present`, async () => {
   setup()
   let arc = '@app\n an-app\n @http'
   let cwd = createTmpDir({ 'app.arc': arc, 'public': {} })
-  staticDeploy(cwd, err => {
-    if (err) assert.fail(err)
-    assert.ok(published, 'Publish was called')
-    done()
+  await new Promise((resolve, reject) => {
+    staticDeploy(cwd, err => {
+      cleanupTmpDir(cwd)
+      if (err) reject(err)
+      else {
+        assert.ok(published, 'Publish was called')
+        resolve()
+      }
+    })
   })
 })
 
-test(`Respect prune param`, (t, done) => {
+test(`Respect prune param`, async () => {
   setup()
   let arc = '@app\n an-app\n @static'
   let cwd = createTmpDir({ 'app.arc': arc, 'public': {} })
   params.prune = true
-  staticDeploy(cwd, err => {
-    if (err) assert.fail(err)
-    assert.ok(published.prune, 'Prune is unchaged')
-    done()
+  await new Promise((resolve, reject) => {
+    staticDeploy(cwd, err => {
+      cleanupTmpDir(cwd)
+      if (err) reject(err)
+      else {
+        assert.ok(published.prune, 'Prune is unchaged')
+        resolve()
+      }
+    })
   })
 })
 
-test(`Respect prune setting in project manifest`, (t, done) => {
+test(`Respect prune setting in project manifest`, async () => {
   setup()
   let arc = '@app\n an-app\n @static\n prune true'
   let cwd = createTmpDir({ 'app.arc': arc, 'public': {} })
-  staticDeploy(cwd, err => {
-    if (err) assert.fail(err)
-    assert.ok(published.prune, 'Prune is enabled')
-    done()
+  await new Promise((resolve, reject) => {
+    staticDeploy(cwd, err => {
+      cleanupTmpDir(cwd)
+      if (err) reject(err)
+      else {
+        assert.ok(published.prune, 'Prune is enabled')
+        resolve()
+      }
+    })
   })
 })
 
-test(`Respect prefix param`, (t, done) => {
+test(`Respect prefix param`, async () => {
   setup()
   let arc = '@app\n an-app\n @static'
   let cwd = createTmpDir({ 'app.arc': arc, 'public': {} })
   params.prefix = 'some-prefix'
-  staticDeploy(cwd, err => {
-    if (err) assert.fail(err)
-    assert.strictEqual(published.prefix, 'some-prefix', 'Prefix is unchanged')
-    done()
+  await new Promise((resolve, reject) => {
+    staticDeploy(cwd, err => {
+      cleanupTmpDir(cwd)
+      if (err) reject(err)
+      else {
+        assert.strictEqual(published.prefix, 'some-prefix', 'Prefix is unchanged')
+        resolve()
+      }
+    })
   })
 })
 
-test(`Respect prefix setting in project manifest`, (t, done) => {
+test(`Respect prefix setting in project manifest`, async () => {
   setup()
   let arc = '@app\n an-app\n @static\n prefix some-prefix'
   let cwd = createTmpDir({ 'app.arc': arc, 'public': {} })
-  staticDeploy(cwd, err => {
-    if (err) assert.fail(err)
-    assert.strictEqual(published.prefix, 'some-prefix', 'Got correct prefix setting')
-    done()
+  await new Promise((resolve, reject) => {
+    staticDeploy(cwd, err => {
+      cleanupTmpDir(cwd)
+      if (err) reject(err)
+      else {
+        assert.strictEqual(published.prefix, 'some-prefix', 'Got correct prefix setting')
+        resolve()
+      }
+    })
   })
 })
 

test/integration/static/publish/index-test.js

@@ -1,18 +1,16 @@
-const { test, after } = require('node:test')
+const { test } = require('node:test')
 const assert = require('node:assert/strict')
 const awsLite = require('@aws-lite/client')
-const { join } = require('path')
+const { join, dirname } = require('path')
 const { mkdtempSync, mkdirSync, writeFileSync, rmSync } = require('fs')
 const { tmpdir } = require('os')
 const _inventory = require('@architect/inventory')
 const { updater } = require('@architect/utils')
 
-let tmpDirs = []
+let tmpDir
 
 function createTmpDir (structure) {
-  const tmpDir = mkdtempSync(join(tmpdir(), 'arc-test-'))
-  tmpDirs.push(tmpDir)
-  const { dirname } = require('path')
+  const dir = mkdtempSync(join(tmpdir(), 'arc-test-'))
 
   function createStructure (base, obj) {
     for (const [ key, value ] of Object.entries(obj)) {
@@ -23,28 +21,17 @@ function createTmpDir (structure) {
       }
       else {
         // Ensure parent directory exists for files
-        const dir = dirname(path)
-        mkdirSync(dir, { recursive: true })
+        const parentDir = dirname(path)
+        mkdirSync(parentDir, { recursive: true })
         writeFileSync(path, value || '')
       }
     }
   }
 
-  createStructure(tmpDir, structure)
-  return tmpDir
+  createStructure(dir, structure)
+  return dir
 }
 
-after(() => {
-  tmpDirs.forEach(dir => {
-    try {
-      rmSync(dir, { recursive: true, force: true })
-    }
-    catch {
-      // Ignore cleanup errors
-    }
-  })
-})
-
 let inventory
 let params
 let putted
@@ -105,15 +92,15 @@ test('Set up env', async () => {
   awsLite.testing.enable()
   assert.ok(awsLite.testing.isEnabled(), 'AWS client testing enabled')
 
-  let cwd = createTmpDir({
+  tmpDir = createTmpDir({
     'app.arc': arc,
     public: {
       'index.html':     content,
       'something.json': content,
       'index.js':       content,
     },
   })
-  inventory = await _inventory({ cwd })
+  inventory = await _inventory({ cwd: tmpDir })
   assert.ok(inventory, 'Got inventory obj')
 })
 
@@ -169,6 +156,14 @@ test(`Static asset deletion (deployAction is 'delete')`, (t, done) => {
 })
 
 test('Teardown', () => {
+  if (tmpDir) {
+    try {
+      rmSync(tmpDir, { recursive: true, force: true })
+    }
+    catch {
+      // Ignore cleanup errors
+    }
+  }
   awsLite.testing.disable()
   assert.ok(!awsLite.testing.isEnabled(), 'Done')
 })

test/unit/static/publish/s3/put-files/index-test.js

@@ -1,20 +1,16 @@
-const { test, before, after } = require('node:test')
+const { test, before } = require('node:test')
 const assert = require('node:assert/strict')
 let awsLite = require('@aws-lite/client')
 const { mkdtempSync, mkdirSync, writeFileSync, rmSync } = require('fs')
 const { tmpdir } = require('os')
-let { join, sep } = require('path')
+let { join, sep, dirname } = require('path')
 let crypto = require('crypto')
 let { pathToUnix } = require('@architect/utils')
 let cwd = process.cwd()
 let filePath = join(process.cwd(), 'src', 'static', 'publish', 's3', 'put-files')
 
-let tmpDirs = []
-
 function createTmpDir (structure) {
   const tmpDir = mkdtempSync(join(tmpdir(), 'arc-test-'))
-  tmpDirs.push(tmpDir)
-  const { dirname } = require('path')
 
   function createStructure (base, obj) {
     for (const [ key, value ] of Object.entries(obj)) {
@@ -36,17 +32,6 @@ function createTmpDir (structure) {
   return tmpDir
 }
 
-after(() => {
-  tmpDirs.forEach(dir => {
-    try {
-      rmSync(dir, { recursive: true, force: true })
-    }
-    catch {
-      // Ignore cleanup errors
-    }
-  })
-})
-
 // Mock put-params by overriding the require cache
 let Module = require('module')
 let originalRequire = Module.prototype.require
@@ -107,6 +92,14 @@ function setup (data) {
 }
 function reset () {
   awsLite.testing.reset()
+  if (tmp) {
+    try {
+      rmSync(tmp, { recursive: true, force: true })
+    }
+    catch {
+      // Ignore cleanup errors
+    }
+  }
   process.chdir(cwd)
 }