Saner test setup

- Upgrade lerna to the currently latest beta version (2.0.0-beta.35) - Get rid of global expect/sinon - Create a new package "@loopback/testlab" for shared test helpers - Configure top-level "npm test"
loopbackio · Feb 2, 2017 · 0332f66 · 0332f66
1 parent 89794cc
commit 0332f66
Show file tree

Hide file tree

Showing 18 changed files with 55 additions and 12 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "lerna": "2.0.0-beta.32",
+  "lerna": "2.0.0-beta.35",
   "packages": [
     "packages/*"
   ],

diff --git a/package.json b/package.json
@@ -3,12 +3,9 @@
   "devDependencies": {
     "@types/mocha": "^2.2.38",
     "@types/node": "^7.0.4",
-    "chai": "^3.5.0",
-    "dirty-chai": "^1.2.2",
-    "lerna": "^2.0.0-beta.32",
+    "lerna": "2.0.0-beta.35",
     "request": "^2.79.0",
     "request-promise": "^4.1.1",
-    "sinon": "^1.17.7",
     "ts-node": "^2.0.0",
     "tsconfig-paths": "^2.1.0",
     "typescript": "^2.1.5"
@@ -19,6 +16,7 @@
     "reflect-metadata": "^0.1.9"
   },
   "scripts": {
-    "bootstrap": "lerna bootstrap"
+    "bootstrap": "lerna bootstrap",
+    "test": "lerna run test"
   }
 }
diff --git a/packages/juggler/package.json b/packages/juggler/package.json
@@ -11,6 +11,7 @@
   "author": "IBM",
   "license": "MIT",
   "devDependencies": {
+    "@loopback/testlab": "^4.0.0-alpha.1",
     "mocha": "^3.2.0",
     "mocha-gherkin": "^0.2.0"
   }

diff --git a/packages/juggler/test/black-box/smoke.ts b/packages/juggler/test/black-box/smoke.ts
@@ -1,3 +1,5 @@
+import {expect} from '@loopback/testlab';
+
 describe('white-box smoke test', () => {
   it('passes', () => {
     expect(true).to.be.true();

diff --git a/packages/juggler/test/white-box/smoke.ts b/packages/juggler/test/white-box/smoke.ts
@@ -1,3 +1,5 @@
+import {expect} from '@loopback/testlab';
+
 suite('white-box smoke test', () => {
   test('passes', () => {
     expect(true).to.be.true();

diff --git a/packages/loopback/package.json b/packages/loopback/package.json
@@ -10,7 +10,12 @@
   },
   "author": "IBM",
   "license": "MIT",
+  "dependencies": {
+    "@loopback/remoting": "^4.0.0-alpha.1",
+    "@loopback/juggler": "^4.0.0-alpha.1"
+  },
   "devDependencies": {
+    "@loopback/testlab": "^4.0.0-alpha.1",
     "mocha": "^3.2.0",
     "mocha-gherkin": "^0.2.0"
   }

diff --git a/packages/loopback/test/black-box/bootstrapping.ts b/packages/loopback/test/black-box/bootstrapping.ts
@@ -1,3 +1,4 @@
+import {expect} from '@loopback/testlab';
 import * as util from 'loopback/test/support/util';
 
 Feature('Bootstrapping',

diff --git a/packages/loopback/test/white-box/application.ts b/packages/loopback/test/white-box/application.ts
@@ -1,4 +1,5 @@
 import {Application, AppState} from 'loopback';
+import {expect} from '@loopback/testlab';
 
 suite('Application', () => {
   suite('constructor(config?: AppConfig)', () => {

diff --git a/packages/remoting/package.json b/packages/remoting/package.json
@@ -11,6 +11,7 @@
   "author": "IBM",
   "license": "MIT",
   "devDependencies": {
+    "@loopback/testlab": "^4.0.0-alpha.1",
     "mocha": "^3.2.0",
     "mocha-gherkin": "^0.2.0"
   }

diff --git a/packages/remoting/test/black-box/smoke.ts b/packages/remoting/test/black-box/smoke.ts
@@ -1,3 +1,5 @@
+import {expect} from '@loopback/testlab';
+
 describe('black-box smoke test', () => {
   it('passes', () => {
     expect(true).to.be.true();

diff --git a/packages/remoting/test/white-box/smoke.ts b/packages/remoting/test/white-box/smoke.ts
@@ -1,3 +1,5 @@
+import {expect} from '@loopback/testlab';
+
 suite('white-box smoke test', () => {
   test('passes', () => {
     expect(true).to.be.true();

diff --git a/packages/testlab/README.md b/packages/testlab/README.md
@@ -0,0 +1,13 @@
+# LoopBack Test Lab
+
+A collection of test utilities we use to write LoopBack tests.
+
+## `expect`
+
+Chai's [BDD API](http://chaijs.com/api/bdd/) configured with
+[dirty-chai](https://github.com/graingert/dirty-chai/blob/master/README.md),
+allowing us to avoid dangerous [asserts on property access](https://github.com/moll/js-must#asserting-on-property-access)
+
+## `sinon`
+
+Spies, mocks and stubs. Learn more at [http://sinonjs.org/](http://sinonjs.org/).
diff --git a/packages/testlab/package.json b/packages/testlab/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@loopback/testlab",
+  "version": "4.0.0-alpha.1",
+  "description": "A collection of test utilities we use to write LoopBack tests.",
+  "main": "testlab",
+  "author": "IBM",
+  "license": "MIT",
+  "dependencies": {
+    "@types/chai": "^3.4.34",
+    "@types/sinon": "^1.16.34",
+    "chai": "^3.5.0",
+    "dirty-chai": "^1.2.2",
+    "sinon": "^1.17.7"
+  }
+}
diff --git a/test/globals.ts → packages/testlab/testlab.ts b/test/globals.ts → packages/testlab/testlab.ts
@@ -4,5 +4,5 @@ import sinon = require('sinon');
 
 chai.use(dirtyChai);
 
-global['expect'] = chai.expect;
-global['sinon'] = sinon;
+export const expect = chai.expect;
+export {sinon};
diff --git a/packages/testlab/tsconfig.json b/packages/testlab/tsconfig.json
@@ -0,0 +1,4 @@
+{
+    "extends": "../tsconfig.json",
+    "baseUrl": "."
+}
diff --git a/test/global-types.d.ts b/test/global-types.d.ts
@@ -1,8 +1,6 @@
 declare var And : any;
-declare var expect : Function;
 declare var Feature : Function;
 declare var Given : any;
 declare var Scenario : any;
-declare var sinon : any;
 declare var Then : any;
 declare var When : any;
diff --git a/test/mocha.opts.black-box b/test/mocha.opts.black-box
@@ -1,5 +1,4 @@
 --require ../../test/ts-node.js
 --compilers ts:tsconfig-paths/register
---require ../../test/globals.ts
 --ui mocha-gherkin --reporter mocha-gherkin/build/spec
 test/black-box/**/*.ts
diff --git a/test/mocha.opts.white-box b/test/mocha.opts.white-box
@@ -1,5 +1,4 @@
 --require ../../test/ts-node.js
 --compilers ts:tsconfig-paths/register
---require ../../test/globals.ts
 --ui tdd
 test/white-box/**/*.ts