feat(test): add zone-testing typing

.gitignore

@@ -8,3 +8,4 @@ parsed-idl/
 .vscode
 npm-debug.log
 build-esm/
+yarn-error.log

gulpfile.js

@@ -106,6 +106,12 @@ gulp.task('build/zone.js.d.ts', ['compile-esm'], function() {
       .pipe(gulp.dest('./dist'));
 });
 
+gulp.task('build/zone-testing.d.ts', ['compile-esm'], function() {
+  return gulp.src('./build-esm/lib/testing/zone-testing.typing.d.ts')
+      .pipe(rename('zone-testing.d.ts'))
+      .pipe(gulp.dest('./dist'));
+});
+
 // Zone for Node.js environment.
 gulp.task('build/zone-node.js', ['compile-esm-node'], function(cb) {
   return generateScript('./lib/node/rollup-main.ts', 'zone-node.js', false, cb);

lib/jasmine/jasmine.ts

@@ -6,4 +6,5 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import './jasmine-patch';
-import './mocha-bridge/mocha-bridge';
+// TODO: @JiaLiPassion, add mocha/jest bridge for jasmine later
+// import './mocha-bridge/mocha-bridge';

lib/mocha/jasmine-bridge/jasmine.expect.ts

@@ -132,11 +132,9 @@ function getMatchers() {
           try {
             if (typeof actual === 'function') {
               actual();
-            } else {
-              pass = eq(actual, expected);
             }
           } catch (error) {
-            pass = eq(error, expected);
+            pass = !expected || eq(error, expected);
           }
           return {pass};
         }
@@ -149,8 +147,6 @@ function getMatchers() {
           try {
             if (typeof actual === 'function') {
               actual();
-            } else {
-              pass = actual instanceof Error;
             }
           } catch (error) {
             pass = true;

lib/mocha/jasmine-bridge/jasmine.ts

@@ -9,6 +9,7 @@ import {mappingBDD} from './jasmine.bdd';
 import {addJasmineClock} from './jasmine.clock';
 import {addJasmineExpect} from './jasmine.expect';
 import {addJasmineSpy} from './jasmine.spy';
+import { formatObject } from './jasmine.util';
 
 Zone.__load_patch('jasmine2mocha', (global: any) => {
   if (typeof global.Mocha === 'undefined') {
@@ -48,4 +49,8 @@ Zone.__load_patch('jasmine2mocha', (global: any) => {
       global.Mocha.__zone_symbol__TIMEOUT = newValue;
     }
   });
+
+  jasmine.pp = function (obj: any): string {
+    return formatObject(obj);
+  };
 });

lib/mocha/jasmine-bridge/jasmine.util.ts

@@ -97,7 +97,11 @@ export function addCustomEqualityTester(jasmine: any) {
   };
 }
 
-export function eq(a: any, b: any) {
+function getErrorMessage(error: any) {
+  return error.message || error.description;
+}
+
+export function eq(a: any, b: any): boolean {
   for (let i = 0; i < customEqualityTesters.length; i++) {
     const result = customEqualityTesters[i](a, b);
     if (result === true || result === false) {
@@ -136,7 +140,8 @@ export function eq(a: any, b: any) {
       return false;
     }
     if (a instanceof Error && b instanceof Error) {
-      return a.message === b.message;
+      return getErrorMessage(a) === getErrorMessage(b) ||
+          toMatch(getErrorMessage(a), getErrorMessage(b));
     }
     let isEqual = true;
 
@@ -156,11 +161,11 @@ export function eq(a: any, b: any) {
     return b.eq(a);
   }
 
-  if (a instanceof Error && typeof b === 'string') {
-    return a.message === b;
+  if (a instanceof Error) {
+    return eq(getErrorMessage(a), b) || toMatch(getErrorMessage(a), b);
   }
-  if (b instanceof Error && typeof a === 'string') {
-    return a === b.message;
+  if (b instanceof Error) {
+    return eq(a, getErrorMessage(b)) || toMatch(a, getErrorMessage(b));
   }
 
   return false;
@@ -184,10 +189,10 @@ export function buildFailureMessage(
     return ' ' + s.toLowerCase();
   });
 
-  var message = 'Expected ' + formatObject(actual) + (isNot ? ' not ' : ' ') + englishyPredicate;
+  let message = 'Expected ' + formatObject(actual) + (isNot ? ' not ' : ' ') + englishyPredicate;
 
   if (expected.length > 0) {
-    for (var i = 0; i < expected.length; i++) {
+    for (let i = 0; i < expected.length; i++) {
       if (i > 0) {
         message += ',';
       }

lib/mocha/jest-bridge/jest.clock.ts

@@ -74,14 +74,14 @@ export function addJestTimer(jest: any, global: any) {
     if (zs) {
       return;
     }
-    const fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec()
+    const fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
     const proxyZoneSpec = ProxyZoneSpec.get();
     jest.__zone_symbol__last_delegate_spec = proxyZoneSpec.getDelegate();
     proxyZoneSpec.setDelegate(fakeAsyncTestZoneSpec);
     fakeAsyncTestZoneSpec.lockDatePatch();
   };
 
-  jest.useRealTimers = function() {
+  jest.useRealTimers = function () {
     const zs = getFakeAsyncTestZoneSpec();
     if (!zs) {
       throw new Error('Must use real timers in the same block with useFakeTimers');
@@ -91,5 +91,5 @@ export function addJestTimer(jest: any, global: any) {
     jest.__zone_symbol__last_delegate_spec = null;
     proxyZoneSpec.setDelegate(lastDelegate);
     zs.unlockDatePatch();
-  }
+  };
 }

lib/mocha/jest-bridge/jest.expect.ts

@@ -6,34 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {Any, eq, toMatch} from '../jasmine-bridge/jasmine.util';
-declare namespace jasmine {
-  interface Expect {
-    anything: () => any;
-    any: (expectedObject: any) => any;
-    arrayContaining: (expectedArray: string[]) => any;
-    objectContaining: (expectedObject: any) => any;
-    stringContaining: (expectedString: string) => any;
-    stringMatching: (expectedMatcher: RegExp|string) => any;
-    extend: (extendedMatchers: any) => any;
-    assertions: (numbers: number) => void;
-    hasAssertions: () => void;
-  }
-
-  interface Matchers {
-    toHaveBeenCalledTimes: (expected: number) => boolean;
-    lastCalledWith: (...params: any[]) => boolean;
-    toHaveBeenLastCalledWith: (...params: any[]) => boolean;
-    toBeInstanceOf: (expected: any) => boolean;
-    toContainEqual: (expected: any) => boolean;
-    toHaveLength: (expected: number) => boolean;
-    toHaveProperty: (expected: any, value: any) => boolean;
-    toMatchObject: (expected: any) => boolean;
-  }
-}
-
 export function expandExpect(global: any) {
   const jasmine = global.jasmine;
-  const expect: jasmine.Expect = global.expect;
+  const expect: any = global.expect;
 
   class Anything {}
 

lib/mocha/jest-bridge/jest.ts

@@ -18,7 +18,7 @@ Zone.__load_patch('jest2mocha', (global: any) => {
   }
   // TODO: @JiaLiPassion, now we only support jest in Mocha runner
   // support jasmine later.
-  if (global.Mocha['__zone_symbol__isBridge']) {
+  if (!global.Mocha || global.Mocha['__zone_symbol__isBridge']) {
     return;
   }
   // create a jasmine global object

lib/mocha/mocha-patch.ts

@@ -8,16 +8,6 @@
 
 'use strict';
 
-declare function suite(description: string, suiteFn: () => void): void;
-declare function test(description: string, testFn: () => void): void;
-declare function specify(description: string, testFn: () => void): void;
-declare function setup(fn: () => void): void;
-declare function teardown(fn: () => void): void;
-declare function suiteSetup(fn: () => void): void;
-declare function suiteTeardown(fn: () => void): void;
-declare function before(fn: () => void): void;
-declare function after(fn: () => void): void;
-
 Zone.__load_patch('Mocha', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
   const Mocha = global.Mocha;