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

rm more vestiges of suite re-entry support

Browse Source
This commit is contained in:
Steve Gravrock
2025-09-28 08:55:47 -07:00
parent 2a83f5cc30
commit 418393c496
4 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10766,10 +10766,6 @@ getJasmineRequireObj().Suite = function(j$) {
return this.result;
}
canBeReentered() {
return this.beforeAllFns.length === 0 && this.afterAllFns.length === 0;
}
sharedUserContext() {
if (!this.sharedContext) {
this.sharedContext = this.parentSuite

3
spec/core/RunnerSpec.js
View File

@@ -33,9 +33,6 @@ describe('Runner', function() {
attrs = attrs || {};
this.id = 'suite' + suiteNumber++;
this.children = attrs.children || [];
this.canBeReentered = function() {
return !attrs.noReenter;
};
this.markedPending = attrs.markedPending || false;
this.sharedUserContext = function() {
return attrs.userContext || {};

44
spec/core/TreeProcessorSpec.js
View File

@@ -6,9 +6,6 @@ describe('TreeProcessor', function() {
attrs = attrs || {};
this.id = 'node' + nodeNumber++;
this.children = attrs.children || [];
this.canBeReentered = function() {
return !attrs.noReenter;
};
this.markedPending = attrs.markedPending || false;
this.sharedUserContext = function() {
return attrs.userContext || {};
@@ -195,47 +192,6 @@ describe('TreeProcessor', function() {
expect(result.isExcluded(childOfPending)).toEqual(false);
});
it('throws if the specified order would re-enter a node', function() {
const leaf1 = new Leaf(),
leaf2 = new Leaf(),
leaf3 = new Leaf(),
reentered = new Node({ noReenter: true, children: [leaf1, leaf2] }),
root = new Node({ children: [reentered, leaf3] }),
processor = new privateUnderTest.TreeProcessor({
tree: root,
runnableIds: [leaf1.id, leaf3.id, leaf2.id]
});
expect(function() {
processor.processTree();
}).toThrowError('Invalid order: would split up a suite');
});
it("does not throw if a node which can't be re-entered is only entered once", function() {
const leaf1 = new Leaf(),
leaf2 = new Leaf(),
leaf3 = new Leaf(),
noReentry = new Node({ noReenter: true }),
root = new Node({ children: [noReentry] }),
processor = new privateUnderTest.TreeProcessor({
tree: root,
runnableIds: [leaf2.id, leaf1.id, leaf3.id]
});
processor.processTree();
});
it("does not throw if a node which can't be re-entered is run directly", function() {
const noReentry = new Node({ noReenter: true }),
root = new Node({ children: [noReentry] }),
processor = new privateUnderTest.TreeProcessor({
tree: root,
runnableIds: [root.id]
});
processor.processTree();
});
it('orders children according to orderChildren when specified', function() {
const leaf1 = new Leaf();
const leaf2 = new Leaf();

4
src/core/Suite.js
View File

@@ -162,10 +162,6 @@ getJasmineRequireObj().Suite = function(j$) {
return this.result;
}
canBeReentered() {
return this.beforeAllFns.length === 0 && this.afterAllFns.length === 0;
}
sharedUserContext() {
if (!this.sharedContext) {
this.sharedContext = this.parentSuite