admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow adding a deprecation object

Browse Source
This commit is contained in:
Tony Brix
2018-02-07 21:10:53 -06:00
parent 3d8e379fa6
commit a8a5b839ab
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/Env.js
View File

@@ -200,11 +200,11 @@ getJasmineRequireObj().Env = function(j$) {
handlingLoadErrors = false; handlingLoadErrors = false;
}; };
this.deprecated = function(msg) { this.deprecated = function(deprecation) {
var runnable = currentRunnable() || topSuite; var runnable = currentRunnable() || topSuite;
runnable.addDeprecationWarning(msg); runnable.addDeprecationWarning(deprecation);
if(typeof console !== 'undefined' && typeof console.warn !== 'undefined') { if(typeof console !== 'undefined' && typeof console.error === 'function') {
console.error('DEPRECATION: ' + msg); console.error('DEPRECATION:', deprecation);
} }
}; };

12
src/core/ExpectationResult.js
View File

@@ -45,10 +45,14 @@ getJasmineRequireObj().buildExpectationResult = function() {
var error = options.error; var error = options.error;
if (!error) { if (!error) {
try { if (options.stack) {
throw new Error(message()); error = options;
} catch (e) { } else {
error = e; try {
throw new Error(message());
} catch (e) {
error = e;
}
} }
} }
return stackFormatter(error); return stackFormatter(error);

7
src/core/Spec.js
View File

@@ -152,8 +152,11 @@ getJasmineRequireObj().Spec = function(j$) {
return this.getSpecName(this); return this.getSpecName(this);
}; };
Spec.prototype.addDeprecationWarning = function(msg) { Spec.prototype.addDeprecationWarning = function(deprecation) {
this.result.deprecationWarnings.push(this.expectationResultFactory({ message: msg })); if (typeof deprecation === 'string') {
deprecation = { message: deprecation };
}
this.result.deprecationWarnings.push(this.expectationResultFactory(deprecation));
}; };
var extractCustomPendingMessage = function(e) { var extractCustomPendingMessage = function(e) {

7
src/core/Suite.js
View File

@@ -148,8 +148,11 @@ getJasmineRequireObj().Suite = function(j$) {
} }
}; };
Suite.prototype.addDeprecationWarning = function(msg) { Suite.prototype.addDeprecationWarning = function(deprecation) {
this.result.deprecationWarnings.push(this.expectationResultFactory({ message: msg })); if (typeof deprecation === 'string') {
deprecation = { message: deprecation };
}
this.result.deprecationWarnings.push(this.expectationResultFactory(deprecation));
}; };
function isFailure(args) { function isFailure(args) {