Merge branch '3.99' into 4.0
This commit is contained in:
@@ -1058,6 +1058,7 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
spec.pend();
|
||||
}
|
||||
currentDeclarationSuite.addChild(spec);
|
||||
|
||||
return spec;
|
||||
};
|
||||
|
||||
|
||||
@@ -3,6 +3,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;
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user