diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index ab030c3f..f5ab77db 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -770,8 +770,6 @@ getJasmineRequireObj().Spec = function(j$) { function() { return ''; }; - this.expectationResultFactory = - attrs.expectationResultFactory || function() {}; this.onLateError = attrs.onLateError || function() {}; this.queueRunnerFactory = attrs.queueRunnerFactory || function() {}; this.catchingExceptions = @@ -818,7 +816,7 @@ getJasmineRequireObj().Spec = function(j$) { } Spec.prototype.addExpectationResult = function(passed, data, isError) { - const expectationResult = this.expectationResultFactory(data); + const expectationResult = j$.buildExpectationResult(data); if (passed) { this.result.passedExpectations.push(expectationResult); } else { @@ -1023,7 +1021,7 @@ getJasmineRequireObj().Spec = function(j$) { deprecation = { message: deprecation }; } this.result.deprecationWarnings.push( - this.expectationResultFactory(deprecation) + j$.buildExpectationResult(deprecation) ); }; @@ -1716,7 +1714,6 @@ getJasmineRequireObj().Env = function(j$) { description: 'Jasmine__TopLevel__Suite', expectationFactory: expectationFactory, asyncExpectationFactory: suiteAsyncExpectationFactory, - expectationResultFactory: j$.buildExpectationResult, autoCleanClosures: config.autoCleanClosures, onLateError: recordLateError }); @@ -2175,7 +2172,6 @@ getJasmineRequireObj().Env = function(j$) { timer: new j$.Timer(), expectationFactory: expectationFactory, asyncExpectationFactory: suiteAsyncExpectationFactory, - expectationResultFactory: j$.buildExpectationResult, throwOnExpectationFailure: config.stopSpecOnExpectationFailure, autoCleanClosures: config.autoCleanClosures, onLateError: recordLateError @@ -2284,7 +2280,6 @@ getJasmineRequireObj().Env = function(j$) { }, onStart: specStarted, description: description, - expectationResultFactory: j$.buildExpectationResult, queueRunnerFactory: queueRunnerFactory, userContext: function() { return suite.clonedSharedUserContext(); @@ -9671,7 +9666,6 @@ getJasmineRequireObj().Suite = function(j$) { this.description = attrs.description; this.expectationFactory = attrs.expectationFactory; this.asyncExpectationFactory = attrs.asyncExpectationFactory; - this.expectationResultFactory = attrs.expectationResultFactory; this.throwOnExpectationFailure = !!attrs.throwOnExpectationFailure; this.autoCleanClosures = attrs.autoCleanClosures === undefined ? true : !!attrs.autoCleanClosures; @@ -9856,14 +9850,14 @@ getJasmineRequireObj().Suite = function(j$) { return; } - var data = { + const data = { matcherName: '', passed: false, expected: '', actual: '', error: arguments[0] }; - var failedExpectation = this.expectationResultFactory(data); + const failedExpectation = j$.buildExpectationResult(data); if (!this.parentSuite) { failedExpectation.globalErrorType = 'afterAll'; @@ -9901,7 +9895,7 @@ getJasmineRequireObj().Suite = function(j$) { Suite.prototype.addExpectationResult = function() { if (isFailure(arguments)) { const data = arguments[1]; - const expectationResult = this.expectationResultFactory(data); + const expectationResult = j$.buildExpectationResult(data); if (this.reportedDone) { this.onLateError(expectationResult); @@ -9920,7 +9914,7 @@ getJasmineRequireObj().Suite = function(j$) { deprecation = { message: deprecation }; } this.result.deprecationWarnings.push( - this.expectationResultFactory(deprecation) + j$.buildExpectationResult(deprecation) ); };