fix: enabling disabled tests rename all pkgs to lib (#1941)

We weren't calling a few more tests and I standardized the package layout so this is harder to miss.
serialport · Sep 25, 2019 · b1cc840 · b1cc840
1 parent 53e2085
commit b1cc840
Show file tree

Hide file tree

Showing 45 changed files with 35 additions and 35 deletions.
diff --git a/packages/serialport/UPGRADE_GUIDE.md → UPGRADE_GUIDE.md b/packages/serialport/UPGRADE_GUIDE.md → UPGRADE_GUIDE.md
diff --git a/...ages/binding-abstract/binding-abstract.js → packages/binding-abstract/lib/index.js b/...ages/binding-abstract/binding-abstract.js → packages/binding-abstract/lib/index.js
diff --git a/...binding-abstract/binding-abstract.test.js → packages/binding-abstract/lib/index.test.js b/...binding-abstract/binding-abstract.test.js → packages/binding-abstract/lib/index.test.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-new */
 
-const BindingAbstract = require('./binding-abstract')
+const BindingAbstract = require('../')
 
 describe('BindingAbstract', () => {
   it('constructs', () => {

diff --git a/packages/binding-abstract/package.json b/packages/binding-abstract/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@serialport/binding-abstract",
   "version": "8.0.1",
-  "main": "binding-abstract.js",
+  "main": "lib",
   "keywords": [
     "serialport-binding"
   ],

diff --git a/packages/binding-mock/binding-mock.js → packages/binding-mock/lib/index.js b/packages/binding-mock/binding-mock.js → packages/binding-mock/lib/index.js
diff --git a/packages/binding-mock/binding-mock.test.js → packages/binding-mock/lib/index.test.js b/packages/binding-mock/binding-mock.test.js → packages/binding-mock/lib/index.test.js
@@ -1,4 +1,4 @@
-const BindingMock = require('./binding-mock')
+const BindingMock = require('../')
 
 // copypasta from bindings/lib/bindings.test.js
 function shouldReject(promise, errType = Error, message = 'Should have rejected') {

diff --git a/packages/binding-mock/legacy.js → packages/binding-mock/lib/legacy.js b/packages/binding-mock/legacy.js → packages/binding-mock/lib/legacy.js
diff --git a/packages/binding-mock/package.json b/packages/binding-mock/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@serialport/binding-mock",
   "version": "8.0.1",
-  "main": "binding-mock.js",
+  "main": "lib",
   "keywords": [
     "serialport-binding"
   ],

diff --git a/...ings/lib/bindings-win32-sn-parser-test.js → ...ings/lib/bindings-win32-sn-parser.test.js b/...ings/lib/bindings-win32-sn-parser-test.js → ...ings/lib/bindings-win32-sn-parser.test.js
@@ -1,6 +1,6 @@
 const serialNumParser = require('./win32-sn-parser')
 
-const devices = {
+const devices = Object.freeze({
   'FTDI Device': {
     pnpId: 'FTDIBUS\\VID_0403+PID_6015+DO004ZB7A\\0000',
     serialNumber: 'DO004ZB7',
@@ -25,7 +25,7 @@ const devices = {
     pnpId: 'WATEVER\\Whoever\\However!',
     serialNumber: null,
   },
-}
+})
 
 describe('serialNumParser', () => {
   Object.entries(devices).forEach(([device, info]) => {

diff --git a/packages/list/lib/list.js → packages/list/lib/index.js b/packages/list/lib/list.js → packages/list/lib/index.js
diff --git a/packages/list/package.json b/packages/list/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@serialport/list",
   "version": "8.0.2",
-  "main": "lib/list.js",
+  "main": "lib",
   "bin": {
-    "serialport-list": "./lib/list.js"
+    "serialport-list": "./lib/index.js"
   },
   "dependencies": {
     "@serialport/bindings": "^8.0.2",

diff --git a/packages/parser-byte-length/byte-length.js → packages/parser-byte-length/lib/index.js b/packages/parser-byte-length/byte-length.js → packages/parser-byte-length/lib/index.js
diff --git a/...es/parser-byte-length/byte-length.test.js → ...ages/parser-byte-length/lib/index.test.js b/...es/parser-byte-length/byte-length.test.js → ...ages/parser-byte-length/lib/index.test.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-new */
 
 const sinon = require('sinon')
-const ByteLengthParser = require('./byte-length')
+const ByteLengthParser = require('../')
 
 describe('ByteLengthParser', () => {
   it('emits data events every 8 bytes', () => {

diff --git a/packages/parser-byte-length/package.json b/packages/parser-byte-length/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@serialport/parser-byte-length",
   "version": "8.0.1",
-  "main": "byte-length.js",
+  "main": "lib",
   "engines": {
     "node": ">=8.6.0"
   },

diff --git a/packages/parser-cctalk/cctalk.js → packages/parser-cctalk/lib/index.js b/packages/parser-cctalk/cctalk.js → packages/parser-cctalk/lib/index.js
diff --git a/packages/parser-cctalk/cctalk.test.js → packages/parser-cctalk/lib/index.test.js b/packages/parser-cctalk/cctalk.test.js → packages/parser-cctalk/lib/index.test.js
@@ -1,5 +1,5 @@
 const sinon = require('sinon')
-const CCTalkParser = require('./cctalk')
+const CCTalkParser = require('../')
 
 describe('CCTalkParser', () => {
   it('constructs', () => {

diff --git a/packages/parser-cctalk/package.json b/packages/parser-cctalk/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@serialport/parser-cctalk",
   "version": "8.0.1",
-  "main": "cctalk.js",
+  "main": "lib",
   "engines": {
     "node": ">=8.6.0"
   },

diff --git a/packages/parser-delimiter/delimiter.js → packages/parser-delimiter/lib/index.js b/packages/parser-delimiter/delimiter.js → packages/parser-delimiter/lib/index.js
diff --git a/packages/parser-delimiter/delimiter.test.js → packages/parser-delimiter/lib/index.test.js b/packages/parser-delimiter/delimiter.test.js → packages/parser-delimiter/lib/index.test.js
@@ -1,8 +1,7 @@
 /* eslint-disable no-new */
 
 const sinon = require('sinon')
-
-const DelimiterParser = require('./delimiter')
+const DelimiterParser = require('../')
 
 describe('DelimiterParser', () => {
   it('transforms data to strings split on a delimiter', () => {

diff --git a/packages/parser-delimiter/package.json b/packages/parser-delimiter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serialport/parser-delimiter",
-  "main": "delimiter.js",
+  "main": "lib",
   "version": "8.0.1",
   "engines": {
     "node": ">=8.6.0"

diff --git a/...-inter-byte-timeout/inter-byte-timeout.js → ...es/parser-inter-byte-timeout/lib/index.js b/...-inter-byte-timeout/inter-byte-timeout.js → ...es/parser-inter-byte-timeout/lib/index.js
diff --git a/...r-byte-timeout/inter-byte-timeout.test.js → ...rser-inter-byte-timeout/lib/index.test.js b/...r-byte-timeout/inter-byte-timeout.test.js → ...rser-inter-byte-timeout/lib/index.test.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-new */
 
 const sinon = require('sinon')
-const InterByteTimeoutParser = require('./inter-byte-timeout')
+const InterByteTimeoutParser = require('../')
 
 function wait(interval) {
   return new Promise((resolve, reject) => {

diff --git a/packages/parser-inter-byte-timeout/package.json b/packages/parser-inter-byte-timeout/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@serialport/parser-inter-byte-timeout",
   "version": "8.0.1",
-  "main": "inter-byte-timeout.js",
+  "main": "lib",
   "engines": {
     "node": ">=8.6.0"
   },

diff --git a/packages/parser-readline/readline.js → packages/parser-readline/lib/index.js b/packages/parser-readline/readline.js → packages/parser-readline/lib/index.js
diff --git a/packages/parser-readline/readline.test.js → packages/parser-readline/lib/index.test.js b/packages/parser-readline/readline.test.js → packages/parser-readline/lib/index.test.js
@@ -2,7 +2,7 @@
 
 const sinon = require('sinon')
 
-const ReadlineParser = require('./readline')
+const ReadlineParser = require('../')
 
 describe('ReadlineParser', () => {
   it('transforms data to strings split on a delimiter', () => {

diff --git a/packages/parser-readline/package.json b/packages/parser-readline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serialport/parser-readline",
-  "main": "readline.js",
+  "main": "lib",
   "version": "8.0.1",
   "dependencies": {
     "@serialport/parser-delimiter": "^8.0.1"

diff --git a/packages/parser-ready/ready.js → packages/parser-ready/lib/index.js b/packages/parser-ready/ready.js → packages/parser-ready/lib/index.js
diff --git a/packages/parser-ready/ready.test.js → packages/parser-ready/lib/index.test.js b/packages/parser-ready/ready.test.js → packages/parser-ready/lib/index.test.js
@@ -2,7 +2,7 @@
 
 const sinon = require('sinon')
 
-const ReadyParser = require('./ready')
+const ReadyParser = require('../')
 
 describe('ReadyParser', () => {
   it('emits data received after the ready data', () => {

diff --git a/packages/parser-ready/package.json b/packages/parser-ready/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serialport/parser-ready",
-  "main": "ready.js",
+  "main": "lib",
   "version": "8.0.1",
   "engines": {
     "node": ">=8.6.0"

diff --git a/packages/parser-regex/regex.js → packages/parser-regex/lib/index.js b/packages/parser-regex/regex.js → packages/parser-regex/lib/index.js
diff --git a/packages/parser-regex/regex.test.js → packages/parser-regex/lib/index.test.js b/packages/parser-regex/regex.test.js → packages/parser-regex/lib/index.test.js
@@ -2,7 +2,7 @@
 
 const sinon = require('sinon')
 
-const RegexParser = require('./regex')
+const RegexParser = require('../')
 
 describe('RegexParser', () => {
   it('transforms data to strings split on either carriage return or new line', () => {

diff --git a/packages/parser-regex/package.json b/packages/parser-regex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serialport/parser-regex",
-  "main": "regex.js",
+  "main": "lib",
   "version": "8.0.1",
   "engines": {
     "node": ">=8.6.0"

diff --git a/packages/parser-slip-encoder/slip-encoder.js → packages/parser-slip-encoder/lib/index.js b/packages/parser-slip-encoder/slip-encoder.js → packages/parser-slip-encoder/lib/index.js
diff --git a/.../parser-slip-encoder/slip-encoder.test.js → ...ges/parser-slip-encoder/lib/index.test.js b/.../parser-slip-encoder/slip-encoder.test.js → ...ges/parser-slip-encoder/lib/index.test.js
@@ -2,7 +2,7 @@
 
 const sinon = require('sinon')
 
-const SlipEncoder = require('./slip-encoder')
+const SlipEncoder = require('../')
 
 describe('SlipEncoderParser', () => {
   it('Adds one delimiter to one-byte messages', () => {

diff --git a/packages/parser-slip-encoder/package.json b/packages/parser-slip-encoder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serialport/parser-slip-encoder",
-  "main": "slip-encoder.js",
+  "main": "lib",
   "version": "8.0.1",
   "engines": {
     "node": ">=8.6.0"

diff --git a/packages/repl/lib/repl.js → packages/repl/lib/index.js b/packages/repl/lib/repl.js → packages/repl/lib/index.js
diff --git a/packages/repl/package.json b/packages/repl/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@serialport/repl",
   "version": "8.0.2",
-  "main": "lib/repl.js",
+  "main": "lib",
   "bin": {
-    "serialport-repl": "./lib/repl.js"
+    "serialport-repl": "./lib/index.js"
   },
   "dependencies": {
     "promirepl": "^2.0.1",

diff --git a/packages/serialport/lib/serialport-test.js → packages/serialport/lib/serialport.test.js b/packages/serialport/lib/serialport-test.js → packages/serialport/lib/serialport.test.js
@@ -1,5 +1,5 @@
 const crypto = require('crypto')
-const SerialPort = require('.')
+const SerialPort = require('../')
 
 let platform
 switch (process.platform) {

diff --git a/packages/stream/stream.js → packages/stream/lib/index.js b/packages/stream/stream.js → packages/stream/lib/index.js
diff --git a/packages/stream/stream.test.js → packages/stream/lib/index.test.js b/packages/stream/stream.test.js → packages/stream/lib/index.test.js
@@ -3,7 +3,7 @@ const sinon = require('sinon')
 chai.use(require('chai-subset'))
 const assert = chai.assert
 
-const SerialPort = require('./stream')
+const SerialPort = require('../')
 const MockBinding = require('@serialport/binding-mock')
 
 describe('SerialPort', () => {

diff --git a/packages/stream/package.json b/packages/stream/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@serialport/stream",
   "version": "8.0.2",
-  "main": "stream.js",
+  "main": "lib",
   "dependencies": {
     "@serialport/binding-mock": "^8.0.1",
     "debug": "^4.1.1"

diff --git a/packages/terminal/lib/terminal.js → packages/terminal/lib/index.js b/packages/terminal/lib/terminal.js → packages/terminal/lib/index.js
diff --git a/packages/terminal/package.json b/packages/terminal/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@serialport/terminal",
   "version": "8.0.2",
-  "main": "lib/terminal.js",
+  "main": "lib",
   "bin": {
-    "serialport-terminal": "./lib/terminal.js"
+    "serialport-terminal": "./lib/index.js"
   },
   "dependencies": {
     "commander": "^2.13.0",

diff --git a/test/initializers/index.js b/test/initializers/index.js
@@ -1,3 +1,6 @@
 const fs = require('fs')
 const files = fs.readdirSync(__dirname).filter(file => file !== 'index.js' && file.match(/\.js$/))
-files.forEach(file => require(`./${file}`))
+files.forEach(file => {
+  console.log(`Loading ${file}`)
+  require(`./${file}`)
+})
diff --git a/test/mocha.opts b/test/mocha.opts
@@ -1,5 +1,3 @@
 --bail
 --require ./test/initializers
-packages/*/test/**/*.js
 packages/**/*.test.js
-