restructure tests and consolidate logic

andy-haynes · Aug 10, 2019 · cf7b08c · cf7b08c
1 parent 6965b1b
commit cf7b08c
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "mocha src/**/.test/*"
+    "test": "mocha tests/*"
   },
   "author": "",
   "license": "ISC",

diff --git a/src/composables/.test/pin_toggle.js → tests/composables/pin_toggle.js b/src/composables/.test/pin_toggle.js → tests/composables/pin_toggle.js
@@ -1,10 +1,5 @@
-const Promise = require('bluebird');
-const { assert } = require('chai');
-const sinon = require('sinon');
-
-const PinToggle = require('../pin_toggle');
-
-sinon.usingPromise(Promise);
+const PinToggle = require('../../src/composables/pin_toggle');
+const { assert, sinon } = require('../utils');
 
 const MockPinToggle = PinToggle.props({
   pin: {

diff --git a/src/controller/.test/controller.js → tests/controller/controller.js b/src/controller/.test/controller.js → tests/controller/controller.js
@@ -1,10 +1,8 @@
-const { assert } = require('chai');
-const sinon = require('sinon');
-
-const { LogLevel } = require('../../constants');
-const { mockPinController } = require('../../tests/mocks');
-const Thermostat = require('../../thermostat/thermostat');
-const Controller = require('../controller');
+const { LogLevel } = require('../../src/constants/index');
+const Thermostat = require('../../src/thermostat/thermostat');
+const Controller = require('../../src/controller/controller');
+const { mockPinController } = require('../mocks');
+const { assert, sinon } = require('../utils');
 
 const TARGET_TEMP = 152;
 

diff --git a/src/controller/.test/pin_controller.js → tests/controller/pin_controller.js b/src/controller/.test/pin_controller.js → tests/controller/pin_controller.js
@@ -1,10 +1,5 @@
-const Promise = require('bluebird');
-const { assert } = require('chai');
-const sinon = require('sinon');
-
-const { mockPinController } = require('../../tests/mocks');
-
-sinon.usingPromise(Promise);
+const { mockPinController } = require('../mocks');
+const { assert } = require('../utils');
 
 const P_INDEX = 10;
 

diff --git a/src/gpio/.test/pin.js → tests/gpio/pin.js b/src/gpio/.test/pin.js → tests/gpio/pin.js
@@ -1,16 +1,7 @@
-const Promise = require('bluebird');
-const chai = require('chai');
-const chaiAsPromised = require('chai-as-promised');
-const sinon = require('sinon');
-
-const { PinState } = require('../../constants');
-const { mockPin } = require('../../tests/mocks');
-const Pin = require('../pin');
-
-sinon.usingPromise(Promise);
-
-chai.use(chaiAsPromised);
-const { assert } = chai;
+const { PinState } = require('../../src/constants/index');
+const Pin = require('../../src/gpio/pin');
+const { mockPin } = require('../mocks');
+const { assert } = require('../utils');
 
 const P_INDEX = 10;
 

diff --git a/src/tests/mocks.js → tests/mocks.js b/src/tests/mocks.js → tests/mocks.js
@@ -1,9 +1,9 @@
 const sinon = require('sinon');
 
-const { LogLevel } = require('../constants');
-const PinController = require('../controller/pin_controller');
-const GPIO = require('../gpio/gpio');
-const Pin = require('../gpio/pin');
+const { LogLevel } = require('../src/constants/index');
+const PinController = require('../src/controller/pin_controller');
+const GPIO = require('../src/gpio/gpio');
+const Pin = require('../src/gpio/pin');
 
 const mockGPIOMethod = (rejects) =>
   rejects

diff --git a/src/thermostat/.test/pid.js → tests/thermostat/pid.js b/src/thermostat/.test/pid.js → tests/thermostat/pid.js
@@ -1,8 +1,8 @@
 const { assert } = require('chai');
 const sinon = require('sinon');
 
-const { LogLevel, PIDState } = require('../../constants');
-const PID = require('../pid');
+const { LogLevel, PIDState } = require('../../src/constants/index');
+const PID = require('../../src/thermostat/pid');
 
 const PID_TARGET = 100;
 const PID_VALUE = 50;

diff --git a/src/thermostat/.test/thermometer.js → tests/thermostat/thermometer.js b/src/thermostat/.test/thermometer.js → tests/thermostat/thermometer.js
@@ -2,8 +2,8 @@ const chai = require('chai');
 const chaiAsPromised = require('chai-as-promised');
 const sinon = require('sinon');
 
-const { LogLevel } = require('../../constants');
-const Thermometer = require('../thermometer');
+const { LogLevel } = require('../../src/constants/index');
+const Thermometer = require('../../src/thermostat/thermometer');
 
 chai.use(chaiAsPromised);
 const { assert } = chai;

diff --git a/tests/utils.js b/tests/utils.js
@@ -0,0 +1,15 @@
+const Promise = require('bluebird');
+const chai = require('chai');
+const chaiAsPromised = require('chai-as-promised');
+const sinon = require('sinon');
+
+sinon.usingPromise(Promise);
+
+chai.use(chaiAsPromised);
+
+const { assert } = chai;
+
+module.exports = {
+  assert,
+  sinon,
+};