Merge branch 'custom-spy-strategy' into 3.0-features

2018-01-22 12:12:59 -08:00
parent e2a191b116 f20f78f82b
commit 038ab87252
18 changed files with 569 additions and 187 deletions
--- a/src/core/requireCore.js
+++ b/src/core/requireCore.js
@@ -48,6 +48,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
    j$.ReportDispatcher = jRequire.ReportDispatcher(j$);
    j$.Spec = jRequire.Spec(j$);
    j$.Spy = jRequire.Spy(j$);
+    j$.SpyFactory = jRequire.SpyFactory(j$);
    j$.SpyRegistry = jRequire.SpyRegistry(j$);
    j$.SpyStrategy = jRequire.SpyStrategy(j$);
    j$.StringMatching = jRequire.StringMatching(j$);