Merge pull request #22147 from inkless/master

[ember-mocha] Adding context, suite to mocha export

types/ember-mocha/ember-mocha-tests.ts

@@ -3,7 +3,7 @@ import {
     setResolver, setupAcceptanceTest, setupComponentTest,
     setupModelTest, setupTest
 } from 'ember-mocha';
-import { describe, it, beforeEach, afterEach, before, after } from 'mocha';
+import { context, describe, it, beforeEach, afterEach, before, after } from 'mocha';
 import chai = require('chai');
 import Ember from "ember";
 import hbs from 'htmlbars-inline-precompile';
@@ -127,6 +127,14 @@ describe('setupTest', function() {
     });
 });
 
+// testing context
+describe('for test suite A', function() {
+    context('when trying method foo', function() {
+        it('should test correctly', function() {
+        });
+    });
+});
+
 // if you don't have a custom resolver, do it like this:
 setResolver(Ember.DefaultResolver.create());
 

types/ember-mocha/index.d.ts

@@ -65,6 +65,7 @@ declare module 'mocha' {
 
     // re-export mocha globals as named exports
     export const describe: Mocha.IContextDefinition;
+    export const context: Mocha.IContextDefinition;
     export const it: Mocha.ITestDefinition;
     export const setup: mochaSetup;
     export const teardown: mochaTeardown;