Skip to content

Commit

Permalink
Project cleanup
Browse files Browse the repository at this point in the history
* Fix tabbing in loopback/index.js

* Remove unused gherkin.ts in root test directory

* Lexical order global type definitions

* Group test dependencies (expect/sinon) into single global file in root
  test directory

* Modify both mocha.opts to import single global file instead of
  expect/sinon separately
  • Loading branch information
superkhau authored and simonhoibm committed Jan 27, 2017
1 parent 0732f37 commit b0a4afc
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 35 deletions.
8 changes: 4 additions & 4 deletions packages/loopback/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export {
Application,
AppConfig,
AppState
} from './lib/application';
Application,
AppConfig,
AppState
} from './lib/application';
18 changes: 0 additions & 18 deletions test/gherkin.ts

This file was deleted.

8 changes: 4 additions & 4 deletions test/global-types.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
declare var And : any;
declare var expect : Function;
declare var Feature : Function;
declare var Scenario : any;
declare var Given : any;
declare var And : any;
declare var When : any;
declare var Scenario : any;
declare var sinon : any;
declare var Then : any;
declare var sinon : any;
declare var When : any;
5 changes: 3 additions & 2 deletions test/expect.ts → test/globals.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import chai = require('chai');
import dirtyChai = require('dirty-chai');
import sinon = require('sinon');

chai.use(dirtyChai);
const expect = chai.expect;

global['expect'] = expect;
global['expect'] = chai.expect;
global['sinon'] = sinon;
4 changes: 1 addition & 3 deletions test/mocha.opts.black-box
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
--require ../../test/ts-node.js
--compilers ts:tsconfig-paths/register
--require ../../test/gherkin.ts
--require ../../test/expect.ts
--require ../../test/sinon.ts
--require ../../test/globals.ts
--ui mocha-gherkin --reporter mocha-gherkin/build/spec
test/black-box/**/*.ts
4 changes: 1 addition & 3 deletions test/mocha.opts.white-box
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
--require ../../test/ts-node.js
--compilers ts:tsconfig-paths/register
--require ../../test/gherkin.ts
--require ../../test/expect.ts
--require ../../test/sinon.ts
--require ../../test/globals.ts
--ui tdd
test/white-box/**/*.ts
1 change: 0 additions & 1 deletion test/sinon.ts

This file was deleted.

0 comments on commit b0a4afc

Please sign in to comment.