Merge branch 'promise-matching-1314' of https://github.com/sderickson/jasmine
This commit is contained in:
@@ -87,6 +87,10 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
|
||||
return obj.nodeType > 0;
|
||||
};
|
||||
|
||||
j$.isPromise = function(obj) {
|
||||
return typeof jasmineGlobal.Promise !== 'undefined' && obj.constructor === jasmineGlobal.Promise;
|
||||
};
|
||||
|
||||
j$.fnNameFor = function(func) {
|
||||
if (func.name) {
|
||||
return func.name;
|
||||
|
||||
Reference in New Issue
Block a user