Merge branch 'master' into expect-context

2018-10-22 14:55:20 -07:00
parent ac07c9ea97 e6a60a7bef
commit 1d130036f4
44 changed files with 2576 additions and 248 deletions
--- a/src/core/requireCore.js
+++ b/src/core/requireCore.js
@@ -39,6 +39,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
    j$.ExceptionFormatter = jRequire.ExceptionFormatter(j$);
    j$.ExpectationFilterChain = jRequire.ExpectationFilterChain();
    j$.Expectation = jRequire.Expectation(j$);
+    j$.AsyncExpectation = jRequire.AsyncExpectation(j$);
    j$.buildExpectationResult = jRequire.buildExpectationResult();
    j$.JsApiReporter = jRequire.JsApiReporter();
    j$.matchersUtil = jRequire.matchersUtil(j$);