add more bdd API and timeout/pending support to mocha

Author: JiaLiPassion

lib/jasmine/jasmine-patch.ts

@@ -61,16 +61,26 @@ Zone.__load_patch('jasmine', (global: any) => {
     jasmineEnv[symbol(methodName)] = originalJasmineFn;
     jasmineEnv[methodName] = function(
         description: string, specDefinitions: Function, timeout: number) {
-      arguments[1] = wrapTestInZone(specDefinitions);
-      return originalJasmineFn.apply(this, arguments);
+      if (typeof timeout !== 'number') {
+        timeout = (jasmine as any)[symbol('mochaTimeout')];
+      }
+      const wrappedSpecDef = wrapTestInZone(specDefinitions);
+      return originalJasmineFn.apply(
+          this,
+          typeof timeout === 'number' ? [description, wrappedSpecDef, timeout] :
+                                        [description, wrappedSpecDef]);
     };
   });
   ['beforeEach', 'afterEach'].forEach(methodName => {
     let originalJasmineFn: Function = jasmineEnv[methodName];
     jasmineEnv[symbol(methodName)] = originalJasmineFn;
     jasmineEnv[methodName] = function(specDefinitions: Function, timeout: number) {
-      arguments[0] = wrapTestInZone(specDefinitions);
-      return originalJasmineFn.apply(this, arguments);
+      if (typeof timeout !== 'number') {
+        timeout = (jasmine as any)[symbol('mochaTimeout')];
+      }
+      const wrappedSpecDef = wrapTestInZone(specDefinitions);
+      return originalJasmineFn.apply(
+          this, typeof timeout === 'number' ? [wrappedSpecDef, timeout] : [wrappedSpecDef]);
     };
   });
 
@@ -81,6 +91,19 @@ Zone.__load_patch('jasmine', (global: any) => {
    */
   function wrapDescribeInZone(describeBody: Function): Function {
     return function() {
+      (jasmine as any)[symbol('mochaTimeout')] = null;
+      if (this && !this.timeout) {
+        this.timeout = function(timeout: number) {
+          (jasmine as any)[symbol('mochaTimeout')] = timeout;
+        }
+      }
+      if (this && !this.skip) {
+        this.skip = function() {
+          if (typeof global['pending'] === 'function') {
+            global['pending']();
+          }
+        }
+      }
       return syncZone.run(describeBody, this, (arguments as any) as any[]);
     };
   }

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

@@ -9,9 +9,10 @@
 export function mappingBDD(Mocha: any, jasmine: any, global: any) {
   const mappings: {Mocha: string, jasmine: string, target?: any}[] = [
     {jasmine: 'beforeAll', Mocha: 'before'}, {jasmine: 'afterAll', Mocha: 'after'},
+    {jasmine: 'beforeEach', Mocha: 'setup'}, {jasmine: 'afterEach', Mocha: 'tearDown'},
     {jasmine: 'it', Mocha: 'it'}, {jasmine: 'it', Mocha: 'specify'}, {jasmine: 'it', Mocha: 'test'},
-    {jasmine: 'describe', Mocha: 'suite'}, {jasmine: 'beforeAll', Mocha: 'suiteSetup'},
-    {jasmine: 'afterAll', Mocha: 'suiteTeardown'},
+    {jasmine: 'describe', Mocha: 'suite'}, {jasmine: 'describe', Mocha: 'context'},
+    {jasmine: 'beforeAll', Mocha: 'suiteSetup'}, {jasmine: 'afterAll', Mocha: 'suiteTeardown'},
     {jasmine: 'xdescribe', Mocha: 'skip', target: global['describe']},
     {jasmine: 'fdescribe', Mocha: 'only', target: global['describe']},
     {jasmine: 'xit', Mocha: 'skip', target: global['it']}, {jasmine: 'fit', Mocha: 'only'}