Deprecate describes with no children
This commit is contained in:
@@ -1983,6 +1983,13 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
suite.pend();
|
||||
}
|
||||
addSpecsToSuite(suite, specDefinitions);
|
||||
if (suite.parentSuite && !suite.children.length) {
|
||||
this.deprecated(
|
||||
'describe with no children (describe() or it()) is ' +
|
||||
'deprecated and will be removed in a future version of Jasmine. ' +
|
||||
'Please either remove the describe or add children to it.'
|
||||
);
|
||||
}
|
||||
return suite;
|
||||
};
|
||||
|
||||
|
||||
@@ -141,11 +141,24 @@ describe('Env', function() {
|
||||
);
|
||||
|
||||
expect(function() {
|
||||
env.describe('fn arg', function() {});
|
||||
env.describe('fn arg', function() {
|
||||
env.it('has a spec', function() {});
|
||||
});
|
||||
}).not.toThrowError(
|
||||
'describe expects a function argument; received [object Function]'
|
||||
);
|
||||
});
|
||||
|
||||
it('logs a deprecation when it has no children', function() {
|
||||
spyOn(env, 'deprecated');
|
||||
env.describe('no children', function() {});
|
||||
expect(env.deprecated).toHaveBeenCalledWith(
|
||||
'describe with no children' +
|
||||
' (describe() or it()) is deprecated and will be removed in a future ' +
|
||||
'version of Jasmine. Please either remove the describe or add ' +
|
||||
'children to it.'
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#it', function() {
|
||||
|
||||
@@ -34,7 +34,11 @@ describe('Exceptions:', function() {
|
||||
});
|
||||
|
||||
it('should handle exceptions thrown directly in top-level describe blocks and continue', function(done) {
|
||||
var secondDescribe = jasmine.createSpy('second describe');
|
||||
var secondDescribe = jasmine
|
||||
.createSpy('second describe')
|
||||
.and.callFake(function() {
|
||||
env.it('has a test', function() {});
|
||||
});
|
||||
env.describe('a suite that throws an exception', function() {
|
||||
env.it('is a test that should pass', function() {
|
||||
this.expect(true).toEqual(true);
|
||||
|
||||
@@ -1863,6 +1863,7 @@ describe("Env integration", function() {
|
||||
} catch(e) {
|
||||
exception = e;
|
||||
}
|
||||
env.it('has a test', function() {});
|
||||
});
|
||||
|
||||
var assertions = function() {
|
||||
@@ -1885,6 +1886,7 @@ describe("Env integration", function() {
|
||||
} catch(e) {
|
||||
exception = e;
|
||||
}
|
||||
env.it('has a test', function() {});
|
||||
});
|
||||
|
||||
var assertions = function() {
|
||||
@@ -1907,6 +1909,7 @@ describe("Env integration", function() {
|
||||
} catch(e) {
|
||||
exception = e;
|
||||
}
|
||||
env.it('has a test', function() {});
|
||||
});
|
||||
|
||||
var assertions = function() {
|
||||
|
||||
@@ -1034,6 +1034,13 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
suite.pend();
|
||||
}
|
||||
addSpecsToSuite(suite, specDefinitions);
|
||||
if (suite.parentSuite && !suite.children.length) {
|
||||
this.deprecated(
|
||||
'describe with no children (describe() or it()) is ' +
|
||||
'deprecated and will be removed in a future version of Jasmine. ' +
|
||||
'Please either remove the describe or add children to it.'
|
||||
);
|
||||
}
|
||||
return suite;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user