Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👎 ✖️ 💯

Globals are pain to use, didn't we learn that lesson in LoopBack 2.x/3.x yet? See strongloop/loopback#2632.

Please review my proposal on how to fix the problem: #27

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. This was just a temp solution. #27 LGTM

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bajtos Yes, it was just a temp solution. +1 for the new testlab package. TY

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.