A spec without expectations is considered passing
- Specs are passing by default unless told otherwise - Getting the result.status of a spec before the spec has run is now undefined instead of pending [finishes #59422744]
This commit is contained in:
@@ -189,18 +189,9 @@ describe("Spec", function() {
|
|||||||
expect(done).toHaveBeenCalled();
|
expect(done).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("#status returns pending by default", function() {
|
it("#status returns passing by default", function() {
|
||||||
var spec = new j$.Spec({fn: jasmine.createSpy("spec body")});
|
var spec = new j$.Spec({fn: jasmine.createSpy("spec body")});
|
||||||
expect(spec.status()).toEqual('pending');
|
expect(spec.status()).toEqual('passed');
|
||||||
});
|
|
||||||
|
|
||||||
it("#status returns pending if no expectations were encountered", function() {
|
|
||||||
var specBody = jasmine.createSpy("spec body"),
|
|
||||||
spec = new j$.Spec({fn: specBody});
|
|
||||||
|
|
||||||
spec.execute();
|
|
||||||
|
|
||||||
expect(spec.status()).toEqual('pending');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("#status returns passed if all expectations in the spec have passed", function() {
|
it("#status returns passed if all expectations in the spec have passed", function() {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
getJasmineRequireObj().Spec = function(j$) {
|
getJasmineRequireObj().Spec = function(j$) {
|
||||||
function Spec(attrs) {
|
function Spec(attrs) {
|
||||||
this.encounteredExpectations = false;
|
|
||||||
this.expectationFactory = attrs.expectationFactory;
|
this.expectationFactory = attrs.expectationFactory;
|
||||||
this.resultCallback = attrs.resultCallback || function() {};
|
this.resultCallback = attrs.resultCallback || function() {};
|
||||||
this.id = attrs.id;
|
this.id = attrs.id;
|
||||||
@@ -26,13 +25,11 @@ getJasmineRequireObj().Spec = function(j$) {
|
|||||||
id: this.id,
|
id: this.id,
|
||||||
description: this.description,
|
description: this.description,
|
||||||
fullName: this.getFullName(),
|
fullName: this.getFullName(),
|
||||||
status: this.status(),
|
|
||||||
failedExpectations: []
|
failedExpectations: []
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
Spec.prototype.addExpectationResult = function(passed, data) {
|
Spec.prototype.addExpectationResult = function(passed, data) {
|
||||||
this.encounteredExpectations = true;
|
|
||||||
if (passed) {
|
if (passed) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -118,7 +115,7 @@ getJasmineRequireObj().Spec = function(j$) {
|
|||||||
return 'disabled';
|
return 'disabled';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.markedPending || !this.encounteredExpectations) {
|
if (this.markedPending) {
|
||||||
return 'pending';
|
return 'pending';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user