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

Refactor Suite#addExpectationResult to use named arguments

Browse Source
This commit is contained in:
Steve Gravrock
2025-09-21 09:05:00 -07:00
parent 4a36ece65b
commit 4020da25a4
2 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/jasmine-core/jasmine.js
View File

@@ -10742,25 +10742,28 @@ getJasmineRequireObj().Suite = function(j$) {
this.onLateError(new Error(msg));
}
addExpectationResult() {
if (isFailure(arguments)) {
const data = arguments[1];
const expectationResult = j$.buildExpectationResult(data);
addExpectationResult(passed, data) {
if (passed) {
// Passed expectations are accepted for compatibility with
// Spec#addExpectationResult, but aren't recorded.
return;
}
if (this.reportedDone) {
this.onLateError(expectationResult);
} else {
this.result.failedExpectations.push(expectationResult);
const expectationResult = j$.buildExpectationResult(data);
// TODO: refactor so that we don't need to override cached status
if (this.result.status) {
this.result.status = 'failed';
}
if (this.reportedDone) {
this.onLateError(expectationResult);
} else {
this.result.failedExpectations.push(expectationResult);
// TODO: refactor so that we don't need to override cached status
if (this.result.status) {
this.result.status = 'failed';
}
}
if (this.#throwOnExpectationFailure) {
throw new j$.errors.ExpectationFailed();
}
if (this.#throwOnExpectationFailure) {
throw new j$.errors.ExpectationFailed();
}
}
@@ -10857,10 +10860,6 @@ getJasmineRequireObj().Suite = function(j$) {
}
}
function isFailure(args) {
return !args[0];
}
return Suite;
};

37
src/core/Suite.js
View File

@@ -220,25 +220,28 @@ getJasmineRequireObj().Suite = function(j$) {
this.onLateError(new Error(msg));
}
addExpectationResult() {
if (isFailure(arguments)) {
const data = arguments[1];
const expectationResult = j$.buildExpectationResult(data);
addExpectationResult(passed, data) {
if (passed) {
// Passed expectations are accepted for compatibility with
// Spec#addExpectationResult, but aren't recorded.
return;
}
if (this.reportedDone) {
this.onLateError(expectationResult);
} else {
this.result.failedExpectations.push(expectationResult);
const expectationResult = j$.buildExpectationResult(data);
// TODO: refactor so that we don't need to override cached status
if (this.result.status) {
this.result.status = 'failed';
}
if (this.reportedDone) {
this.onLateError(expectationResult);
} else {
this.result.failedExpectations.push(expectationResult);
// TODO: refactor so that we don't need to override cached status
if (this.result.status) {
this.result.status = 'failed';
}
}
if (this.#throwOnExpectationFailure) {
throw new j$.errors.ExpectationFailed();
}
if (this.#throwOnExpectationFailure) {
throw new j$.errors.ExpectationFailed();
}
}
@@ -335,9 +338,5 @@ getJasmineRequireObj().Suite = function(j$) {
}
}
function isFailure(args) {
return !args[0];
}
return Suite;
};