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

Fixed reporting of suites that are skipped due to a beforeAll failure

Browse Source
This commit is contained in:
Steve Gravrock
2021-12-20 13:39:24 -08:00
parent 656e6614da
commit c431590d65
3 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1972,32 +1972,38 @@ getJasmineRequireObj().Env = function(j$) {
reporter.suiteStarted(child.result, resolve);
});
await reportChildrenOfBeforeAllFailure(child);
markNotRun(child);
// Marking the suite passed is consistent with how suites that
// contain failed specs but no suite-level failures are reported.
child.result.status = 'passed';
await new Promise(function(resolve) {
reporter.suiteDone(child.result, resolve);
});
} /* a spec */ else {
} else {
/* a spec */
await new Promise(function(resolve) {
reporter.specStarted(child.result, resolve);
});
child.addExpectationResult(
false,
{
passed: false,
message:
'Not run because a beforeAll function failed. The ' +
'beforeAll failure will be reported on the suite that ' +
'caused it.'
},
true
);
child.result.status = 'failed';
await new Promise(function(resolve) {
markNotRun(child);
reporter.specDone(child.result, resolve);
});
}
}
function markNotRun(runnable) {
runnable.addExpectationResult(
false,
{
passed: false,
message: 'Not run because a beforeAll function failed'
},
true
);
runnable.result.status = 'failed';
}
}
};

42
spec/core/integration/SpecRunningSpec.js
View File

@@ -1113,16 +1113,13 @@ describe('spec running', function() {
})
);
// The child suite should be reported as passed, for consistency with
// suites that contain failing specs but no suite-level errors.
expect(reporter.suiteDone).toHaveBeenCalledWith(
jasmine.objectContaining({
fullName: 'a nested suite',
status: 'failed',
failedExpectations: [
jasmine.objectContaining({
passed: false,
message: 'Not run because a beforeAll function failed'
})
]
status: 'passed',
failedExpectations: []
})
);
@@ -1138,7 +1135,10 @@ describe('spec running', function() {
failedExpectations: [
jasmine.objectContaining({
passed: false,
message: 'Not run because a beforeAll function failed'
message:
'Not run because a beforeAll function failed. The ' +
'beforeAll failure will be reported on the suite that ' +
'caused it.'
})
]
})
@@ -1156,7 +1156,10 @@ describe('spec running', function() {
failedExpectations: [
jasmine.objectContaining({
passed: false,
message: 'Not run because a beforeAll function failed'
message:
'Not run because a beforeAll function failed. The ' +
'beforeAll failure will be reported on the suite that ' +
'caused it.'
})
]
})
@@ -1214,16 +1217,13 @@ describe('spec running', function() {
})
);
// The child suite should be reported as passed, for consistency with
// suites that contain failing specs but no suite-level errors.
expect(reporter.suiteDone).toHaveBeenCalledWith(
jasmine.objectContaining({
fullName: 'a suite a nested suite',
status: 'failed',
failedExpectations: [
jasmine.objectContaining({
passed: false,
message: 'Not run because a beforeAll function failed'
})
]
status: 'passed',
failedExpectations: []
})
);
@@ -1239,7 +1239,10 @@ describe('spec running', function() {
failedExpectations: [
jasmine.objectContaining({
passed: false,
message: 'Not run because a beforeAll function failed'
message:
'Not run because a beforeAll function failed. The ' +
'beforeAll failure will be reported on the suite that ' +
'caused it.'
})
]
})
@@ -1257,7 +1260,10 @@ describe('spec running', function() {
failedExpectations: [
jasmine.objectContaining({
passed: false,
message: 'Not run because a beforeAll function failed'
message:
'Not run because a beforeAll function failed. The ' +
'beforeAll failure will be reported on the suite that ' +
'caused it.'
})
]
})

36
src/core/Env.js
View File

@@ -831,32 +831,38 @@ getJasmineRequireObj().Env = function(j$) {
reporter.suiteStarted(child.result, resolve);
});
await reportChildrenOfBeforeAllFailure(child);
markNotRun(child);
// Marking the suite passed is consistent with how suites that
// contain failed specs but no suite-level failures are reported.
child.result.status = 'passed';
await new Promise(function(resolve) {
reporter.suiteDone(child.result, resolve);
});
} /* a spec */ else {
} else {
/* a spec */
await new Promise(function(resolve) {
reporter.specStarted(child.result, resolve);
});
child.addExpectationResult(
false,
{
passed: false,
message:
'Not run because a beforeAll function failed. The ' +
'beforeAll failure will be reported on the suite that ' +
'caused it.'
},
true
);
child.result.status = 'failed';
await new Promise(function(resolve) {
markNotRun(child);
reporter.specDone(child.result, resolve);
});
}
}
function markNotRun(runnable) {
runnable.addExpectationResult(
false,
{
passed: false,
message: 'Not run because a beforeAll function failed'
},
true
);
runnable.result.status = 'failed';
}
}
};