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

Merge branch 'lintfix' of https://github.com/voithos/jasmine

Browse Source 
- Merges #1428 from @voithos
This commit is contained in:
Steve Gravrock
2017-10-23 11:01:18 -07:00
parent 0f650e1d03 20d86b2a00
commit 6c363f11b3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1636,7 +1636,8 @@ getJasmineRequireObj().CallTracker = function(j$) {
var str = Object.prototype.toString.apply(argsAsArray[i]), var str = Object.prototype.toString.apply(argsAsArray[i]),
primitives = /^\[object (Boolean|String|RegExp|Number)/; primitives = /^\[object (Boolean|String|RegExp|Number)/;
if (argsAsArray[i] == null || str.match(primitives)) { // All falsey values are either primitives, `null`, or `undefined.
if (!argsAsArray[i] || str.match(primitives)) {
clonedArgs.push(argsAsArray[i]); clonedArgs.push(argsAsArray[i]);
} else { } else {
clonedArgs.push(j$.util.clone(argsAsArray[i])); clonedArgs.push(j$.util.clone(argsAsArray[i]));

3
src/core/CallTracker.js
View File

@@ -14,7 +14,8 @@ getJasmineRequireObj().CallTracker = function(j$) {
var str = Object.prototype.toString.apply(argsAsArray[i]), var str = Object.prototype.toString.apply(argsAsArray[i]),
primitives = /^\[object (Boolean|String|RegExp|Number)/; primitives = /^\[object (Boolean|String|RegExp|Number)/;
if (argsAsArray[i] == null || str.match(primitives)) { // All falsey values are either primitives, `null`, or `undefined.
if (!argsAsArray[i] || str.match(primitives)) {
clonedArgs.push(argsAsArray[i]); clonedArgs.push(argsAsArray[i]);
} else { } else {
clonedArgs.push(j$.util.clone(argsAsArray[i])); clonedArgs.push(j$.util.clone(argsAsArray[i]));