rm more vestiges of suite re-entry support
This commit is contained in:
@@ -10766,10 +10766,6 @@ getJasmineRequireObj().Suite = function(j$) {
|
|||||||
return this.result;
|
return this.result;
|
||||||
}
|
}
|
||||||
|
|
||||||
canBeReentered() {
|
|
||||||
return this.beforeAllFns.length === 0 && this.afterAllFns.length === 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
sharedUserContext() {
|
sharedUserContext() {
|
||||||
if (!this.sharedContext) {
|
if (!this.sharedContext) {
|
||||||
this.sharedContext = this.parentSuite
|
this.sharedContext = this.parentSuite
|
||||||
|
|||||||
@@ -33,9 +33,6 @@ describe('Runner', function() {
|
|||||||
attrs = attrs || {};
|
attrs = attrs || {};
|
||||||
this.id = 'suite' + suiteNumber++;
|
this.id = 'suite' + suiteNumber++;
|
||||||
this.children = attrs.children || [];
|
this.children = attrs.children || [];
|
||||||
this.canBeReentered = function() {
|
|
||||||
return !attrs.noReenter;
|
|
||||||
};
|
|
||||||
this.markedPending = attrs.markedPending || false;
|
this.markedPending = attrs.markedPending || false;
|
||||||
this.sharedUserContext = function() {
|
this.sharedUserContext = function() {
|
||||||
return attrs.userContext || {};
|
return attrs.userContext || {};
|
||||||
|
|||||||
@@ -6,9 +6,6 @@ describe('TreeProcessor', function() {
|
|||||||
attrs = attrs || {};
|
attrs = attrs || {};
|
||||||
this.id = 'node' + nodeNumber++;
|
this.id = 'node' + nodeNumber++;
|
||||||
this.children = attrs.children || [];
|
this.children = attrs.children || [];
|
||||||
this.canBeReentered = function() {
|
|
||||||
return !attrs.noReenter;
|
|
||||||
};
|
|
||||||
this.markedPending = attrs.markedPending || false;
|
this.markedPending = attrs.markedPending || false;
|
||||||
this.sharedUserContext = function() {
|
this.sharedUserContext = function() {
|
||||||
return attrs.userContext || {};
|
return attrs.userContext || {};
|
||||||
@@ -195,47 +192,6 @@ describe('TreeProcessor', function() {
|
|||||||
expect(result.isExcluded(childOfPending)).toEqual(false);
|
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() {
|
it('orders children according to orderChildren when specified', function() {
|
||||||
const leaf1 = new Leaf();
|
const leaf1 = new Leaf();
|
||||||
const leaf2 = new Leaf();
|
const leaf2 = new Leaf();
|
||||||
|
|||||||
@@ -162,10 +162,6 @@ getJasmineRequireObj().Suite = function(j$) {
|
|||||||
return this.result;
|
return this.result;
|
||||||
}
|
}
|
||||||
|
|
||||||
canBeReentered() {
|
|
||||||
return this.beforeAllFns.length === 0 && this.afterAllFns.length === 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
sharedUserContext() {
|
sharedUserContext() {
|
||||||
if (!this.sharedContext) {
|
if (!this.sharedContext) {
|
||||||
this.sharedContext = this.parentSuite
|
this.sharedContext = this.parentSuite
|
||||||
|
|||||||
Reference in New Issue
Block a user