test

Author: JiaLiPassion

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

@@ -135,16 +135,6 @@ function getMatchers() {
             }
           } catch (error) {
             pass = !expected || eq(error, expected);
-            if (!pass) {
-              console.log('expected.message', expected instanceof Error, expected.message);
-              console.log('expected.description', expected instanceof Error, expected.description);
-              console.log('error.description', error instanceof Error, error.description);
-              console.log('eq', error.message === expected.message);
-              console.log('eq1', error.description === expected.description);
-              console.log('eq2', eq(error, expected));
-              console.log('eq3', !expected);
-              console.log('eq4', !expected || eq(error, expected));
-            }
           }
           return {pass};
         }

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

@@ -136,13 +136,13 @@ export function eq(a: any, b: any): boolean {
     if (b instanceof ObjectContaining) {
       return b.match(a);
     }
-    if (Object.keys(a).length !== Object.keys(b).length) {
-      return false;
-    }
     if (a instanceof Error && b instanceof Error) {
       return getErrorMessage(a) === getErrorMessage(b) ||
           toMatch(getErrorMessage(a), getErrorMessage(b));
     }
+    if (Object.keys(a).length !== Object.keys(b).length) {
+      return false;
+    }
     let isEqual = true;
 
     for (let prop in a) {

lib/mocha/mocha-patch.ts

@@ -138,8 +138,12 @@ Zone.__load_patch('Mocha', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
   }
 
   function wrapTestInZone(args: IArguments): any[] {
+    const timeoutArgs = args.length > 0 ? args[args.length - 1] : null;
     const asyncTest = function(fn: Function) {
       return function(done: Function) {
+        if (this && typeof this.timeout === 'function' && typeof timeoutArgs === 'number') {
+          this.timeout(timeoutArgs);
+        }
         fn = beforeTest(this, fn);
         return testZone.run(fn, this, [done]);
       };