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

Merge branch 'fix' of https://github.com/logankd/jasmine into logankd-fix

Browse Source 
- Merges #1192 from @logankd
- Fixes #1188
This commit is contained in:
Gregg Van Hove
2016-09-01 20:42:53 -07:00
parent ab0567c665 c0a9d20a02
commit 8366ef9be5
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/jasmine-core/jasmine.js
View File

@@ -2989,16 +2989,20 @@ getJasmineRequireObj().matchersUtil = function(j$) {
} }
var extraKeys = []; var extraKeys = [];
for (var i in allKeys) { if (allKeys.length === 0) {
if (!allKeys[i].match(/^[0-9]+$/)) { return allKeys;
extraKeys.push(allKeys[i]); }
}
for (var x = 0; x < allKeys.length; x++) {
if (!allKeys[x].match(/^[0-9]+$/)) {
extraKeys.push(allKeys[x]);
}
} }
return extraKeys; return extraKeys;
} }
} }
function has(obj, key) { function has(obj, key) {
return Object.prototype.hasOwnProperty.call(obj, key); return Object.prototype.hasOwnProperty.call(obj, key);
} }

14
src/core/matchers/matchersUtil.js
View File

@@ -223,16 +223,20 @@ getJasmineRequireObj().matchersUtil = function(j$) {
} }
var extraKeys = []; var extraKeys = [];
for (var i in allKeys) { if (allKeys.length === 0) {
if (!allKeys[i].match(/^[0-9]+$/)) { return allKeys;
extraKeys.push(allKeys[i]); }
}
for (var x = 0; x < allKeys.length; x++) {
if (!allKeys[x].match(/^[0-9]+$/)) {
extraKeys.push(allKeys[x]);
}
} }
return extraKeys; return extraKeys;
} }
} }
function has(obj, key) { function has(obj, key) {
return Object.prototype.hasOwnProperty.call(obj, key); return Object.prototype.hasOwnProperty.call(obj, key);
} }