From 3ce313ebb91e55c62124e29feebb46e2478fb025 Mon Sep 17 00:00:00 2001
From: Christopher Hiller <boneskull@boneskull.com>
Date: Wed, 9 Mar 2022 16:06:31 -0800
Subject: [PATCH] chore(support): ditch gulp

This PR builds and tests `@appium/support` without Gulp.  Much like the changes to `appium`:

- Test files reorganized and renamed
- Tests run via `mocha` proper using `@babel/register` (no build needed)
- Build run via `@babel/cli`
---
 .wallaby.js                                   |   5 ++--
 packages/support/gulpfile.js                  |  21 --------------
 packages/support/package.json                 |  11 ++++---
 .../{env-e2e-specs.js => e2e/env.e2e.spec.js} |   4 +--
 .../fixture/appium-v1-dependency.package.json |   0
 .../fixture/appium-v1-package/index.js        |   0
 .../fixture/appium-v1-package/package.json    |   0
 .../fixture/appium-v2-dependency.package.json |   0
 .../fixture/appium-v2-package/index.js        |   0
 .../fixture/appium-v2-package/package.json    |   0
 .../fixture}/images/cropped-image.b64         |   0
 .../{ => e2e/fixture}/images/full-image.b64   |   0
 .../image-util.e2e.spec.js}                   |   6 ++--
 .../mjpeg.e2e.spec.js}                        |   2 +-
 .../{net-e2e-specs.js => e2e/net.e2e.spec.js} |   4 +--
 .../node.e2e.spec.js}                         |   2 +-
 .../util.e2e.spec.js}                         |   4 +--
 .../{zip-e2e-specs.js => e2e/zip.e2e.spec.js} |   6 ++--
 .../{ => unit}/assets/sample_binary.plist     | Bin
 .../test/{ => unit}/assets/sample_text.plist  |   0
 .../test/{env-specs.js => unit/env.spec.js}   |  14 ++++-----
 .../test/{fs-specs.js => unit/fs.spec.js}     |  27 +++++++++++-------
 .../{index-specs.js => unit/index.spec.js}    |   2 +-
 .../log-internals.spec.js}                    |   4 +--
 .../support/test/{ => unit}/logger/helpers.js |   2 +-
 .../logger/logger-force.spec.js}              |   0
 .../logger/logger-normal.spec.js}             |   0
 .../logger/logger-test.spec.js}               |   0
 .../test/{node-specs.js => unit/node.spec.js} |   2 +-
 .../test/{npm-specs.js => unit/npm.spec.js}   |   2 +-
 .../{plist-specs.js => unit/plist.spec.js}    |   2 +-
 .../process.spec.js}                          |   2 +-
 .../{system-specs.js => unit/system.spec.js}  |   2 +-
 .../tempdir.spec.js}                          |   2 +-
 .../{timing-specs.js => unit/timing.spec.js}  |   2 +-
 .../test/{util-specs.js => unit/util.spec.js} |   2 +-
 36 files changed, 60 insertions(+), 70 deletions(-)
 delete mode 100644 packages/support/gulpfile.js
 rename packages/support/test/{env-e2e-specs.js => e2e/env.e2e.spec.js} (99%)
 rename packages/support/test/{ => e2e}/fixture/appium-v1-dependency.package.json (100%)
 rename packages/support/test/{ => e2e}/fixture/appium-v1-package/index.js (100%)
 rename packages/support/test/{ => e2e}/fixture/appium-v1-package/package.json (100%)
 rename packages/support/test/{ => e2e}/fixture/appium-v2-dependency.package.json (100%)
 rename packages/support/test/{ => e2e}/fixture/appium-v2-package/index.js (100%)
 rename packages/support/test/{ => e2e}/fixture/appium-v2-package/package.json (100%)
 rename packages/support/test/{ => e2e/fixture}/images/cropped-image.b64 (100%)
 rename packages/support/test/{ => e2e/fixture}/images/full-image.b64 (100%)
 rename packages/support/test/{image-util-e2e-specs.js => e2e/image-util.e2e.spec.js} (95%)
 rename packages/support/test/{mjpeg-e2e-specs.js => e2e/mjpeg.e2e.spec.js} (99%)
 rename packages/support/test/{net-e2e-specs.js => e2e/net.e2e.spec.js} (86%)
 rename packages/support/test/{node-e2e-specs.js => e2e/node.e2e.spec.js} (94%)
 rename packages/support/test/{util-e2e-specs.js => e2e/util.e2e.spec.js} (98%)
 rename packages/support/test/{zip-e2e-specs.js => e2e/zip.e2e.spec.js} (98%)
 rename packages/support/test/{ => unit}/assets/sample_binary.plist (100%)
 rename packages/support/test/{ => unit}/assets/sample_text.plist (100%)
 rename packages/support/test/{env-specs.js => unit/env.spec.js} (97%)
 rename packages/support/test/{fs-specs.js => unit/fs.spec.js} (92%)
 rename packages/support/test/{index-specs.js => unit/index.spec.js} (95%)
 rename packages/support/test/{log-internals-specs.js => unit/log-internals.spec.js} (96%)
 rename packages/support/test/{ => unit}/logger/helpers.js (97%)
 rename packages/support/test/{logger/logger-force-specs.js => unit/logger/logger-force.spec.js} (100%)
 rename packages/support/test/{logger/logger-normal-specs.js => unit/logger/logger-normal.spec.js} (100%)
 rename packages/support/test/{logger/logger-test-specs.js => unit/logger/logger-test.spec.js} (100%)
 rename packages/support/test/{node-specs.js => unit/node.spec.js} (97%)
 rename packages/support/test/{npm-specs.js => unit/npm.spec.js} (95%)
 rename packages/support/test/{plist-specs.js => unit/plist.spec.js} (97%)
 rename packages/support/test/{process-specs.js => unit/process.spec.js} (98%)
 rename packages/support/test/{system-specs.js => unit/system.spec.js} (98%)
 rename packages/support/test/{tempdir-specs.js => unit/tempdir.spec.js} (98%)
 rename packages/support/test/{timing-specs.js => unit/timing.spec.js} (99%)
 rename packages/support/test/{util-specs.js => unit/util.spec.js} (99%)

diff --git a/.wallaby.js b/.wallaby.js
index ca540caa5..a7919702e 100644
--- a/.wallaby.js
+++ b/.wallaby.js
@@ -25,11 +25,11 @@ module.exports = (wallaby) => {
       // below this are fixtures
       {
         binary: true,
-        pattern: './packages/support/test/assets/sample_binary.plist',
+        pattern: './packages/support/test/unit/assets/sample_binary.plist',
       },
       {
         instrument: false,
-        pattern: './packages/support/test/assets/sample_text.plist',
+        pattern: './packages/support/test/unit/assets/sample_text.plist',
       },
       {
         instrument: false,
@@ -50,6 +50,7 @@ module.exports = (wallaby) => {
       './packages/*/test/**/*-specs.js',
       './packages/*/test/unit/**/*.spec.js',
       '!./packages/*/test/**/*-e2e-specs.js',
+      '!./packages/*/test/e2e/**/*',
       '!./packages/*/node_modules/**',
       // this is more of an E2E test and it's tedious to run
       '!./packages/gulp-plugins/test/transpile-specs.js',
diff --git a/packages/support/gulpfile.js b/packages/support/gulpfile.js
deleted file mode 100644
index 3dd7fbbb8..000000000
--- a/packages/support/gulpfile.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-const gulp = require('gulp');
-const boilerplate = require('@appium/gulp-plugins').boilerplate.use(gulp);
-
-gulp.task('copy-files', () =>
-  gulp.src('./test/assets/*').pipe(gulp.dest('./build/test/assets/')));
-
-boilerplate({
-  build: '@appium/support',
-  coverage: {
-    files: [
-      './build/test/**/*-specs.js',
-      '!./build/test/assets/**',
-      '!./build/test/images/**',
-      '!./build/test/**/*-e2e-specs.js'
-    ],
-    verbose: true,
-  },
-  postTranspile: ['copy-files']
-});
diff --git a/packages/support/package.json b/packages/support/package.json
index ed7882e00..b058eea14 100644
--- a/packages/support/package.json
+++ b/packages/support/package.json
@@ -32,10 +32,13 @@
     "build"
   ],
   "scripts": {
-    "dev": "gulp dev --no-notif",
-    "build": "gulp transpile",
-    "test": "gulp unit-test:run",
-    "test:e2e": "gulp e2e-test:run"
+    "build": "babel lib --root-mode=upward --delete-dir-on-start --out-dir=build/lib",
+    "dev": "npm run build -- --watch",
+    "fix": "npm run lint -- --fix",
+    "lint": "eslint -c ../../.eslintrc --ignore-path ../../.eslintignore .",
+    "test": "npm run test:unit",
+    "test:e2e": "mocha --require ../../test/setup-babel.js --timeout 20s --slow 10s \"./test/e2e/**/*.spec.js\"",
+    "test:unit": "mocha --require ../../test/setup-babel.js \"./test/unit/**/*.spec.js\""
   },
   "dependencies": {
     "@babel/runtime": "7.16.3",
diff --git a/packages/support/test/env-e2e-specs.js b/packages/support/test/e2e/env.e2e.spec.js
similarity index 99%
rename from packages/support/test/env-e2e-specs.js
rename to packages/support/test/e2e/env.e2e.spec.js
index c058175a5..f96e7b895 100644
--- a/packages/support/test/env-e2e-specs.js
+++ b/packages/support/test/e2e/env.e2e.spec.js
@@ -1,13 +1,13 @@
 // @ts-check
 
 import path from 'path';
-import {fs, tempDir} from '../lib';
+import { fs, tempDir } from '../../lib';
 import {
   DEFAULT_APPIUM_HOME,
   readPackageInDir,
   resolveAppiumHome,
   resolveManifestPath,
-} from '../lib/env';
+} from '../../lib/env';
 
 const {expect} = chai;
 
diff --git a/packages/support/test/fixture/appium-v1-dependency.package.json b/packages/support/test/e2e/fixture/appium-v1-dependency.package.json
similarity index 100%
rename from packages/support/test/fixture/appium-v1-dependency.package.json
rename to packages/support/test/e2e/fixture/appium-v1-dependency.package.json
diff --git a/packages/support/test/fixture/appium-v1-package/index.js b/packages/support/test/e2e/fixture/appium-v1-package/index.js
similarity index 100%
rename from packages/support/test/fixture/appium-v1-package/index.js
rename to packages/support/test/e2e/fixture/appium-v1-package/index.js
diff --git a/packages/support/test/fixture/appium-v1-package/package.json b/packages/support/test/e2e/fixture/appium-v1-package/package.json
similarity index 100%
rename from packages/support/test/fixture/appium-v1-package/package.json
rename to packages/support/test/e2e/fixture/appium-v1-package/package.json
diff --git a/packages/support/test/fixture/appium-v2-dependency.package.json b/packages/support/test/e2e/fixture/appium-v2-dependency.package.json
similarity index 100%
rename from packages/support/test/fixture/appium-v2-dependency.package.json
rename to packages/support/test/e2e/fixture/appium-v2-dependency.package.json
diff --git a/packages/support/test/fixture/appium-v2-package/index.js b/packages/support/test/e2e/fixture/appium-v2-package/index.js
similarity index 100%
rename from packages/support/test/fixture/appium-v2-package/index.js
rename to packages/support/test/e2e/fixture/appium-v2-package/index.js
diff --git a/packages/support/test/fixture/appium-v2-package/package.json b/packages/support/test/e2e/fixture/appium-v2-package/package.json
similarity index 100%
rename from packages/support/test/fixture/appium-v2-package/package.json
rename to packages/support/test/e2e/fixture/appium-v2-package/package.json
diff --git a/packages/support/test/images/cropped-image.b64 b/packages/support/test/e2e/fixture/images/cropped-image.b64
similarity index 100%
rename from packages/support/test/images/cropped-image.b64
rename to packages/support/test/e2e/fixture/images/cropped-image.b64
diff --git a/packages/support/test/images/full-image.b64 b/packages/support/test/e2e/fixture/images/full-image.b64
similarity index 100%
rename from packages/support/test/images/full-image.b64
rename to packages/support/test/e2e/fixture/images/full-image.b64
diff --git a/packages/support/test/image-util-e2e-specs.js b/packages/support/test/e2e/image-util.e2e.spec.js
similarity index 95%
rename from packages/support/test/image-util-e2e-specs.js
rename to packages/support/test/e2e/image-util.e2e.spec.js
index d0298aeed..9fe965fa8 100644
--- a/packages/support/test/image-util-e2e-specs.js
+++ b/packages/support/test/e2e/image-util.e2e.spec.js
@@ -1,13 +1,13 @@
 import {
   base64ToImage, imageToBase64, cropImage,
   getJimpImage, MIME_PNG,
-} from '../lib/image-util';
+} from '../../lib/image-util';
 import path from 'path';
 import _ from 'lodash';
-import { fs } from '../lib';
+import { fs } from '../../lib';
 
 
-const FIXTURES_ROOT = path.resolve(__dirname, '..', '..', 'test', 'images');
+const FIXTURES_ROOT = path.resolve(__dirname, 'fixture', 'images');
 
 async function getImage (name) {
   const imagePath = path.resolve(FIXTURES_ROOT, name);
diff --git a/packages/support/test/mjpeg-e2e-specs.js b/packages/support/test/e2e/mjpeg.e2e.spec.js
similarity index 99%
rename from packages/support/test/mjpeg-e2e-specs.js
rename to packages/support/test/e2e/mjpeg.e2e.spec.js
index cae92f489..e9cf9351f 100644
--- a/packages/support/test/mjpeg-e2e-specs.js
+++ b/packages/support/test/e2e/mjpeg.e2e.spec.js
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { mjpeg } from '../lib';
+import { mjpeg } from '../../lib';
 import B from 'bluebird';
 import http from 'http';
 import mJpegServer from 'mjpeg-server';
diff --git a/packages/support/test/net-e2e-specs.js b/packages/support/test/e2e/net.e2e.spec.js
similarity index 86%
rename from packages/support/test/net-e2e-specs.js
rename to packages/support/test/e2e/net.e2e.spec.js
index 53e5df5b1..e86160859 100644
--- a/packages/support/test/net-e2e-specs.js
+++ b/packages/support/test/e2e/net.e2e.spec.js
@@ -1,6 +1,6 @@
 import path from 'path';
-import { downloadFile } from '../lib/net';
-import { tempDir, fs } from '../lib/index';
+import { downloadFile } from '../../lib/net';
+import { tempDir, fs } from '../../lib/index';
 
 
 describe('#net', function () {
diff --git a/packages/support/test/node-e2e-specs.js b/packages/support/test/e2e/node.e2e.spec.js
similarity index 94%
rename from packages/support/test/node-e2e-specs.js
rename to packages/support/test/e2e/node.e2e.spec.js
index 06441e6ae..bc284adb7 100644
--- a/packages/support/test/node-e2e-specs.js
+++ b/packages/support/test/e2e/node.e2e.spec.js
@@ -1,4 +1,4 @@
-import { node } from '../lib';
+import { node } from '../../lib';
 
 
 
diff --git a/packages/support/test/util-e2e-specs.js b/packages/support/test/e2e/util.e2e.spec.js
similarity index 98%
rename from packages/support/test/util-e2e-specs.js
rename to packages/support/test/e2e/util.e2e.spec.js
index cc044d1ed..127bb6781 100644
--- a/packages/support/test/util-e2e-specs.js
+++ b/packages/support/test/e2e/util.e2e.spec.js
@@ -1,7 +1,7 @@
 import B from 'bluebird';
 import path from 'path';
-import * as util from '../lib/util';
-import { tempDir, fs } from '../lib/index';
+import * as util from '../../lib/util';
+import { tempDir, fs } from '../../lib/index';
 
 
 describe('#util', function () {
diff --git a/packages/support/test/zip-e2e-specs.js b/packages/support/test/e2e/zip.e2e.spec.js
similarity index 98%
rename from packages/support/test/zip-e2e-specs.js
rename to packages/support/test/e2e/zip.e2e.spec.js
index d24eabda4..f0b29d330 100644
--- a/packages/support/test/zip-e2e-specs.js
+++ b/packages/support/test/e2e/zip.e2e.spec.js
@@ -1,7 +1,7 @@
 import path from 'path';
-import * as zip from '../lib/zip';
-import { tempDir, fs } from '../lib/index';
-import { MockReadWriteStream } from './helpers';
+import * as zip from '../../lib/zip';
+import { tempDir, fs } from '../../lib/index';
+import { MockReadWriteStream } from '../helpers';
 
 
 describe('#zip', function () {
diff --git a/packages/support/test/assets/sample_binary.plist b/packages/support/test/unit/assets/sample_binary.plist
similarity index 100%
rename from packages/support/test/assets/sample_binary.plist
rename to packages/support/test/unit/assets/sample_binary.plist
diff --git a/packages/support/test/assets/sample_text.plist b/packages/support/test/unit/assets/sample_text.plist
similarity index 100%
rename from packages/support/test/assets/sample_text.plist
rename to packages/support/test/unit/assets/sample_text.plist
diff --git a/packages/support/test/env-specs.js b/packages/support/test/unit/env.spec.js
similarity index 97%
rename from packages/support/test/env-specs.js
rename to packages/support/test/unit/env.spec.js
index f04bea42d..be2ab6db1 100644
--- a/packages/support/test/env-specs.js
+++ b/packages/support/test/unit/env.spec.js
@@ -2,25 +2,25 @@
 // @ts-check
 
 import path from 'path';
-import {rewiremock} from './helpers';
-import {initMocks} from './mocks';
+import {rewiremock} from '../helpers';
+import {initMocks} from '../mocks';
 
 const {expect} = chai;
 
 describe('env', function () {
-  /** @type {typeof import('../lib/env')} */
+  /** @type {typeof import('../../lib/env')} */
   let env;
 
   /** @type {sinon.SinonSandbox} */
   let sandbox;
 
-  /** @type {import('./mocks').MockPkgDir} */
+  /** @type {import('../mocks').MockPkgDir} */
   let MockPkgDir;
 
-  /** @type {import('./mocks').MockReadPkg} */
+  /** @type {import('../mocks').MockReadPkg} */
   let MockReadPkg;
 
-  /** @type {import('./mocks').MockTeenProcess} */
+  /** @type {import('../mocks').MockTeenProcess} */
   let MockTeenProcess;
 
   /** @type {string|undefined} */
@@ -36,7 +36,7 @@ describe('env', function () {
     envAppiumHome = process.env.APPIUM_HOME;
     delete process.env.APPIUM_HOME;
 
-    env = rewiremock.proxy(() => require('../lib/env'), overrides);
+    env = rewiremock.proxy(() => require('../../lib/env'), overrides);
   });
 
   describe('resolveManifestPath()', function () {
diff --git a/packages/support/test/fs-specs.js b/packages/support/test/unit/fs.spec.js
similarity index 92%
rename from packages/support/test/fs-specs.js
rename to packages/support/test/unit/fs.spec.js
index 6c62a6bc6..9e72cb7ca 100644
--- a/packages/support/test/fs-specs.js
+++ b/packages/support/test/unit/fs.spec.js
@@ -1,5 +1,6 @@
-import { fs, tempDir } from '../lib/index.js';
+import { fs, tempDir } from '../../lib/index.js';
 import path from 'path';
+import { createSandbox } from 'sinon';
 import { exec } from 'teen_process';
 import _ from 'lodash';
 
@@ -12,6 +13,15 @@ describe('fs', function () {
 
   const existingPath = __filename;
 
+  let sandbox;
+  beforeEach(function () {
+    sandbox = createSandbox();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
+
   describe('mkdir()', function () {
     let dirName = path.resolve(__dirname, 'tmp');
 
@@ -141,7 +151,7 @@ describe('fs', function () {
     });
   });
   it('glob()', async function () {
-    let glob = '*-specs.js';
+    let glob = '*.spec.js';
     let tests = await fs.glob(glob, {cwd: __dirname});
     tests.should.be.an('array');
     tests.should.have.length.above(2);
@@ -152,16 +162,13 @@ describe('fs', function () {
       await chai.expect(fs.walkDir(__dirname, true, (item) => item.endsWith('logger/helpers.js'))).to.eventually.not.be.null;
     });
     it('should walk all elements recursive', async function () {
-      await chai.expect(fs.walkDir(path.join(__dirname, 'fixture'), true, _.noop)).to.eventually.be.null;
+      await chai.expect(fs.walkDir(path.join(__dirname, '..', 'e2e', 'fixture'), true, _.noop)).to.eventually.be.null;
     });
     it('should throw error through callback', async function () {
-      let processed = 0;
-      await chai.expect(fs.walkDir(__dirname, true,
-        () => {
-          ++processed;
-          throw 'Callback error';
-        })).to.be.rejectedWith('Callback error');
-      processed.should.equal(1);
+      const err = new Error('Callback error');
+      const stub = sandbox.stub().rejects(err);
+      await (fs.walkDir(__dirname, true, stub)).should.eventually.be.rejectedWith(err);
+      stub.should.have.been.calledOnce;
     });
     it('should traverse non-recursively', async function () {
       const filePath = await fs.walkDir(__dirname, false, (item) => item.endsWith('logger/helpers.js'));
diff --git a/packages/support/test/index-specs.js b/packages/support/test/unit/index.spec.js
similarity index 95%
rename from packages/support/test/index-specs.js
rename to packages/support/test/unit/index.spec.js
index 4c623ee39..a4bd99f4c 100644
--- a/packages/support/test/index-specs.js
+++ b/packages/support/test/unit/index.spec.js
@@ -1,5 +1,5 @@
 
-import AppiumSupport from '../lib/index.js';
+import AppiumSupport from '../../lib/index.js';
 
 let { system, tempDir, util } = AppiumSupport;
 
diff --git a/packages/support/test/log-internals-specs.js b/packages/support/test/unit/log-internals.spec.js
similarity index 96%
rename from packages/support/test/log-internals-specs.js
rename to packages/support/test/unit/log-internals.spec.js
index e02b136e6..c7f846d1a 100644
--- a/packages/support/test/log-internals-specs.js
+++ b/packages/support/test/unit/log-internals.spec.js
@@ -1,7 +1,7 @@
-import { fs } from '../lib/index';
+import { fs } from '../../lib/index';
 import os from 'os';
 import path from 'path';
-import { SecureValuesPreprocessor } from '../lib/log-internal';
+import { SecureValuesPreprocessor } from '../../lib/log-internal';
 
 
 const CONFIG_PATH = path.resolve(os.tmpdir(), 'rules.json');
diff --git a/packages/support/test/logger/helpers.js b/packages/support/test/unit/logger/helpers.js
similarity index 97%
rename from packages/support/test/logger/helpers.js
rename to packages/support/test/unit/logger/helpers.js
index f23f093d2..3c18f39c3 100644
--- a/packages/support/test/logger/helpers.js
+++ b/packages/support/test/unit/logger/helpers.js
@@ -1,6 +1,6 @@
 import sinon from 'sinon';
 import _ from 'lodash';
-import { logger } from '../../lib';
+import { logger } from '../../../lib';
 
 
 let sandbox;
diff --git a/packages/support/test/logger/logger-force-specs.js b/packages/support/test/unit/logger/logger-force.spec.js
similarity index 100%
rename from packages/support/test/logger/logger-force-specs.js
rename to packages/support/test/unit/logger/logger-force.spec.js
diff --git a/packages/support/test/logger/logger-normal-specs.js b/packages/support/test/unit/logger/logger-normal.spec.js
similarity index 100%
rename from packages/support/test/logger/logger-normal-specs.js
rename to packages/support/test/unit/logger/logger-normal.spec.js
diff --git a/packages/support/test/logger/logger-test-specs.js b/packages/support/test/unit/logger/logger-test.spec.js
similarity index 100%
rename from packages/support/test/logger/logger-test-specs.js
rename to packages/support/test/unit/logger/logger-test.spec.js
diff --git a/packages/support/test/node-specs.js b/packages/support/test/unit/node.spec.js
similarity index 97%
rename from packages/support/test/node-specs.js
rename to packages/support/test/unit/node.spec.js
index 0ad41c8a1..6d8785357 100644
--- a/packages/support/test/node-specs.js
+++ b/packages/support/test/unit/node.spec.js
@@ -1,4 +1,4 @@
-import { node } from '../lib';
+import { node } from '../../lib';
 
 describe('node utilities', function () {
   describe('getObjectSize', function () {
diff --git a/packages/support/test/npm-specs.js b/packages/support/test/unit/npm.spec.js
similarity index 95%
rename from packages/support/test/npm-specs.js
rename to packages/support/test/unit/npm.spec.js
index 32c9b80fc..0db7d0b16 100644
--- a/packages/support/test/npm-specs.js
+++ b/packages/support/test/unit/npm.spec.js
@@ -1,6 +1,6 @@
 // transpile:mocha
 
-import {NPM} from '../lib/npm';
+import {NPM} from '../../lib/npm';
 
 describe('npm', function () {
 
diff --git a/packages/support/test/plist-specs.js b/packages/support/test/unit/plist.spec.js
similarity index 97%
rename from packages/support/test/plist-specs.js
rename to packages/support/test/unit/plist.spec.js
index ccd6c1e78..373acb8f9 100644
--- a/packages/support/test/plist-specs.js
+++ b/packages/support/test/unit/plist.spec.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import { plist, tempDir, fs } from '../lib/index.js';
+import { plist, tempDir, fs } from '../../lib/index.js';
 
 
 
diff --git a/packages/support/test/process-specs.js b/packages/support/test/unit/process.spec.js
similarity index 98%
rename from packages/support/test/process-specs.js
rename to packages/support/test/unit/process.spec.js
index 93951b966..10a6c2a4e 100644
--- a/packages/support/test/process-specs.js
+++ b/packages/support/test/unit/process.spec.js
@@ -1,6 +1,6 @@
 import * as teenProcess from 'teen_process';
 import { createSandbox } from 'sinon';
-import { process } from '../lib/index.js';
+import { process } from '../../lib/index.js';
 import { retryInterval } from 'asyncbox';
 
 const SubProcess = teenProcess.SubProcess;
diff --git a/packages/support/test/system-specs.js b/packages/support/test/unit/system.spec.js
similarity index 98%
rename from packages/support/test/system-specs.js
rename to packages/support/test/unit/system.spec.js
index c309b3607..752c0ea0b 100644
--- a/packages/support/test/system-specs.js
+++ b/packages/support/test/unit/system.spec.js
@@ -1,4 +1,4 @@
-import { system } from '../lib/index.js';
+import { system } from '../../lib/index.js';
 import os from 'os';
 import { createSandbox } from 'sinon';
 import * as teen_process from 'teen_process';
diff --git a/packages/support/test/tempdir-specs.js b/packages/support/test/unit/tempdir.spec.js
similarity index 98%
rename from packages/support/test/tempdir-specs.js
rename to packages/support/test/unit/tempdir.spec.js
index bfe2c002b..d8150248b 100644
--- a/packages/support/test/tempdir-specs.js
+++ b/packages/support/test/unit/tempdir.spec.js
@@ -1,5 +1,5 @@
 
-import { tempDir, fs } from '../lib/index.js';
+import { tempDir, fs } from '../../lib/index.js';
 
 
 describe('tempdir', function () {
diff --git a/packages/support/test/timing-specs.js b/packages/support/test/unit/timing.spec.js
similarity index 99%
rename from packages/support/test/timing-specs.js
rename to packages/support/test/unit/timing.spec.js
index 0c1563ce0..1f17b7ad3 100644
--- a/packages/support/test/timing-specs.js
+++ b/packages/support/test/unit/timing.spec.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { createSandbox } from 'sinon';
-import { timing } from '../lib';
+import { timing } from '../../lib';
 
 
 const expect = chai.expect;
diff --git a/packages/support/test/util-specs.js b/packages/support/test/unit/util.spec.js
similarity index 99%
rename from packages/support/test/util-specs.js
rename to packages/support/test/unit/util.spec.js
index 17dd0bb23..db5c265fe 100644
--- a/packages/support/test/util-specs.js
+++ b/packages/support/test/unit/util.spec.js
@@ -1,5 +1,5 @@
 
-import { util, fs, tempDir } from '../lib';
+import { util, fs, tempDir } from '../../lib';
 import B from 'bluebird';
 import { createSandbox } from 'sinon';
 import os from 'os';