Merge branch '3.99' into 4.0

This commit is contained in:
Steve Gravrock
2021-07-29 21:46:48 -07:00
5 changed files with 35 additions and 2 deletions

View File

@@ -663,6 +663,12 @@ getJasmineRequireObj().Spec = function(j$) {
this.expectationFactory = attrs.expectationFactory;
this.asyncExpectationFactory = attrs.asyncExpectationFactory;
this.resultCallback = attrs.resultCallback || function() {};
/**
* The unique ID of this spec.
* @name Spec#id
* @readonly
* @type {string}
*/
this.id = attrs.id;
this.description = attrs.description || '';
this.queueableFn = attrs.queueableFn;
@@ -2026,6 +2032,7 @@ getJasmineRequireObj().Env = function(j$) {
spec.pend();
}
currentDeclarationSuite.addChild(spec);
return spec;
};
@@ -9038,6 +9045,12 @@ getJasmineRequireObj().StackTrace = function(j$) {
getJasmineRequireObj().Suite = function(j$) {
function Suite(attrs) {
this.env = attrs.env;
/**
* The unique ID of this suite.
* @name Suite#id
* @readonly
* @type {string}
*/
this.id = attrs.id;
this.parentSuite = attrs.parentSuite;
this.description = attrs.description;