Top-level specs should compute fullName the same as Suites
- No longer include "Jasmine__TopLevel__Suite"
This commit is contained in:
@@ -627,7 +627,13 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
var getSpecName = function(spec, suite) {
|
var getSpecName = function(spec, suite) {
|
||||||
return suite.getFullName() + ' ' + spec.description;
|
var fullName = [spec.description],
|
||||||
|
suiteFullName = suite.getFullName();
|
||||||
|
|
||||||
|
if (suiteFullName !== '') {
|
||||||
|
fullName.unshift(suiteFullName);
|
||||||
|
}
|
||||||
|
return fullName.join(' ');
|
||||||
};
|
};
|
||||||
|
|
||||||
// TODO: we may just be able to pass in the fn instead of wrapping here
|
// TODO: we may just be able to pass in the fn instead of wrapping here
|
||||||
@@ -2185,13 +2191,13 @@ getJasmineRequireObj().Suite = function(j$) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Suite.prototype.getFullName = function() {
|
Suite.prototype.getFullName = function() {
|
||||||
var fullName = this.description;
|
var fullName = [];
|
||||||
for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) {
|
for (var parentSuite = this; parentSuite; parentSuite = parentSuite.parentSuite) {
|
||||||
if (parentSuite.parentSuite) {
|
if (parentSuite.parentSuite) {
|
||||||
fullName = parentSuite.description + ' ' + fullName;
|
fullName.unshift(parentSuite.description);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return fullName;
|
return fullName.join(' ');
|
||||||
};
|
};
|
||||||
|
|
||||||
Suite.prototype.disable = function() {
|
Suite.prototype.disable = function() {
|
||||||
|
|||||||
@@ -11,14 +11,14 @@ describe("Suite", function() {
|
|||||||
expect(suite.id).toEqual(456);
|
expect(suite.id).toEqual(456);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("returns its full name", function() {
|
it("returns blank full name for top level suite", function() {
|
||||||
var env = new jasmineUnderTest.Env(),
|
var env = new jasmineUnderTest.Env(),
|
||||||
suite = new jasmineUnderTest.Suite({
|
suite = new jasmineUnderTest.Suite({
|
||||||
env: env,
|
env: env,
|
||||||
description: "I am a suite"
|
description: "I am a suite"
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(suite.getFullName()).toEqual("I am a suite");
|
expect(suite.getFullName()).toEqual("");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("returns its full name when it has parent suites", function() {
|
it("returns its full name when it has parent suites", function() {
|
||||||
|
|||||||
@@ -123,7 +123,13 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
var getSpecName = function(spec, suite) {
|
var getSpecName = function(spec, suite) {
|
||||||
return suite.getFullName() + ' ' + spec.description;
|
var fullName = [spec.description],
|
||||||
|
suiteFullName = suite.getFullName();
|
||||||
|
|
||||||
|
if (suiteFullName !== '') {
|
||||||
|
fullName.unshift(suiteFullName);
|
||||||
|
}
|
||||||
|
return fullName.join(' ');
|
||||||
};
|
};
|
||||||
|
|
||||||
// TODO: we may just be able to pass in the fn instead of wrapping here
|
// TODO: we may just be able to pass in the fn instead of wrapping here
|
||||||
|
|||||||
@@ -29,13 +29,13 @@ getJasmineRequireObj().Suite = function(j$) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Suite.prototype.getFullName = function() {
|
Suite.prototype.getFullName = function() {
|
||||||
var fullName = this.description;
|
var fullName = [];
|
||||||
for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) {
|
for (var parentSuite = this; parentSuite; parentSuite = parentSuite.parentSuite) {
|
||||||
if (parentSuite.parentSuite) {
|
if (parentSuite.parentSuite) {
|
||||||
fullName = parentSuite.description + ' ' + fullName;
|
fullName.unshift(parentSuite.description);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return fullName;
|
return fullName.join(' ');
|
||||||
};
|
};
|
||||||
|
|
||||||
Suite.prototype.disable = function() {
|
Suite.prototype.disable = function() {
|
||||||
|
|||||||
Reference in New Issue
Block a user