Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Commit

Permalink
fix(test): fix mocha compatible issue
Browse files Browse the repository at this point in the history
  • Loading branch information
JiaLiPassion committed Feb 24, 2018
1 parent e1df4bc commit 2b214ce
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ script:
- node_modules/.bin/gulp test/node
- node simple-server.js 2>&1> server.log&
- node ./test/webdriver/test.sauce.js
- npm install jasmine@3.0.0 jasmine-core@3.0.0
- npm install jasmine@3.0.0 jasmine-core@3.0.0 mocha@5.0.1
- npm run test:phantomjs-single
- node_modules/.bin/karma start karma-dist-sauce-jasmine3.conf.js --single-run
- node_modules/.bin/karma start karma-build-sauce-selenium3-mocha.conf.js --single-run
- node_modules/.bin/gulp test/node
2 changes: 1 addition & 1 deletion karma-build-sauce-selenium3-mocha.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@

module.exports = function (config) {
require('./karma-dist-mocha.conf.js')(config);
require('./sauce-selenium3.conf')(config);
require('./sauce-selenium3.conf')(config, ['SL_IE9']);
};
3 changes: 0 additions & 3 deletions lib/mocha/mocha.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@

Mocha.Runner.prototype.run = function(fn: Function) {
this.on('test', (e: any) => {
if (Zone.current !== rootZone) {
throw new Error('Unexpected zone: ' + Zone.current.name);
}
testZone = rootZone.fork(new ProxyZoneSpec());
});

Expand Down

0 comments on commit 2b214ce

Please sign in to comment.