admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge common async/sync expectation stuff

Browse Source
This commit is contained in:
Gregg Van Hove
2018-10-24 16:17:30 -07:00
parent 1e47dcf2cc
commit 2d303a6e46
8 changed files with 441 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/Env.js
View File

@@ -193,7 +193,7 @@ getJasmineRequireObj().Env = function(j$) {
};
j$.Expectation.addCoreMatchers(j$.matchers);
j$.AsyncExpectation.addCoreMatchers(j$.asyncMatchers);
j$.Expectation.addAsyncCoreMatchers(j$.asyncMatchers);
var nextSpecId = 0;
var getNextSpecId = function() {
@@ -206,7 +206,7 @@ getJasmineRequireObj().Env = function(j$) {
};
var expectationFactory = function(actual, spec) {
return j$.Expectation.Factory({
return j$.Expectation.factory({
util: j$.matchersUtil,
customEqualityTesters: runnableResources[spec.id].customEqualityTesters,
customMatchers: runnableResources[spec.id].customMatchers,
@@ -220,7 +220,7 @@ getJasmineRequireObj().Env = function(j$) {
};
var asyncExpectationFactory = function(actual, spec) {
return j$.AsyncExpectation.factory({
return j$.Expectation.asyncFactory({
util: j$.matchersUtil,
customEqualityTesters: runnableResources[spec.id].customEqualityTesters,
actual: actual,