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

Merge branch 'jasmine-deep-clone-args' of https://github.com/aj-dev/jasmine

Browse Source 
- Merges #1424 from @aj-dev
This commit is contained in:
Steve Gravrock
2017-10-23 11:32:58 -07:00
parent 6c363f11b3 1f6c91de7c
commit b7e9594c86
5 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
var j$ = {};
jRequire.base(j$, jasmineGlobal);
j$.util = jRequire.util();
j$.util = jRequire.util(j$);
j$.errors = jRequire.errors();
j$.formatErrorMsg = jRequire.formatErrorMsg();
j$.Any = jRequire.Any(j$);
@@ -66,7 +66,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
j$.ArrayWithExactContents = jRequire.ArrayWithExactContents(j$);
j$.pp = jRequire.pp(j$);
j$.QueueRunner = jRequire.QueueRunner(j$);
j$.ReportDispatcher = jRequire.ReportDispatcher();
j$.ReportDispatcher = jRequire.ReportDispatcher(j$);
j$.Spec = jRequire.Spec(j$);
j$.Spy = jRequire.Spy(j$);
j$.SpyRegistry = jRequire.SpyRegistry(j$);
@@ -355,7 +355,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
};
};
getJasmineRequireObj().util = function() {
getJasmineRequireObj().util = function(j$) {
var util = {};
@@ -412,6 +412,23 @@ getJasmineRequireObj().util = function() {
return cloned;
};
util.cloneArgs = function(args) {
var clonedArgs = [];
var argsAsArray = j$.util.argsToArray(args);
for(var i = 0; i < argsAsArray.length; i++) {
var str = Object.prototype.toString.apply(argsAsArray[i]),
primitives = /^\[object (Boolean|String|RegExp|Number)/;
// All falsey values are either primitives, `null`, or `undefined.
if (!argsAsArray[i] || str.match(primitives)) {
clonedArgs.push(argsAsArray[i]);
} else {
clonedArgs.push(j$.util.clone(argsAsArray[i]));
}
}
return clonedArgs;
};
util.getPropertyDescriptor = function(obj, methodName) {
var descriptor,
proto = obj;
@@ -1629,26 +1646,9 @@ getJasmineRequireObj().CallTracker = function(j$) {
var calls = [];
var opts = {};
function argCloner(context) {
var clonedArgs = [];
var argsAsArray = j$.util.argsToArray(context.args);
for(var i = 0; i < argsAsArray.length; i++) {
var str = Object.prototype.toString.apply(argsAsArray[i]),
primitives = /^\[object (Boolean|String|RegExp|Number)/;
// All falsey values are either primitives, `null`, or `undefined.
if (!argsAsArray[i] || str.match(primitives)) {
clonedArgs.push(argsAsArray[i]);
} else {
clonedArgs.push(j$.util.clone(argsAsArray[i]));
}
}
context.args = clonedArgs;
}
this.track = function(context) {
if(opts.cloneArgs) {
argCloner(context);
context.args = j$.util.cloneArgs(context.args);
}
calls.push(context);
};
@@ -4326,7 +4326,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
return QueueRunner;
};
getJasmineRequireObj().ReportDispatcher = function() {
getJasmineRequireObj().ReportDispatcher = function(j$) {
function ReportDispatcher(methods) {
var dispatchedMethods = methods || [];
@@ -4364,7 +4364,7 @@ getJasmineRequireObj().ReportDispatcher = function() {
for (var i = 0; i < reporters.length; i++) {
var reporter = reporters[i];
if (reporter[method]) {
reporter[method].apply(reporter, args);
reporter[method].apply(reporter, j$.util.cloneArgs(args));
}
}
}

19
src/core/CallTracker.js
View File

@@ -7,26 +7,9 @@ getJasmineRequireObj().CallTracker = function(j$) {
var calls = [];
var opts = {};
function argCloner(context) {
var clonedArgs = [];
var argsAsArray = j$.util.argsToArray(context.args);
for(var i = 0; i < argsAsArray.length; i++) {
var str = Object.prototype.toString.apply(argsAsArray[i]),
primitives = /^\[object (Boolean|String|RegExp|Number)/;
// All falsey values are either primitives, `null`, or `undefined.
if (!argsAsArray[i] || str.match(primitives)) {
clonedArgs.push(argsAsArray[i]);
} else {
clonedArgs.push(j$.util.clone(argsAsArray[i]));
}
}
context.args = clonedArgs;
}
this.track = function(context) {
if(opts.cloneArgs) {
argCloner(context);
context.args = j$.util.cloneArgs(context.args);
}
calls.push(context);
};

4
src/core/ReportDispatcher.js
View File

@@ -1,4 +1,4 @@
getJasmineRequireObj().ReportDispatcher = function() {
getJasmineRequireObj().ReportDispatcher = function(j$) {
function ReportDispatcher(methods) {
var dispatchedMethods = methods || [];
@@ -36,7 +36,7 @@ getJasmineRequireObj().ReportDispatcher = function() {
for (var i = 0; i < reporters.length; i++) {
var reporter = reporters[i];
if (reporter[method]) {
reporter[method].apply(reporter, args);
reporter[method].apply(reporter, j$.util.cloneArgs(args));
}
}
}

4
src/core/requireCore.js
View File

@@ -23,7 +23,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
var j$ = {};
jRequire.base(j$, jasmineGlobal);
j$.util = jRequire.util();
j$.util = jRequire.util(j$);
j$.errors = jRequire.errors();
j$.formatErrorMsg = jRequire.formatErrorMsg();
j$.Any = jRequire.Any(j$);
@@ -44,7 +44,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
j$.ArrayWithExactContents = jRequire.ArrayWithExactContents(j$);
j$.pp = jRequire.pp(j$);
j$.QueueRunner = jRequire.QueueRunner(j$);
j$.ReportDispatcher = jRequire.ReportDispatcher();
j$.ReportDispatcher = jRequire.ReportDispatcher(j$);
j$.Spec = jRequire.Spec(j$);
j$.Spy = jRequire.Spy(j$);
j$.SpyRegistry = jRequire.SpyRegistry(j$);

19
src/core/util.js
View File

@@ -1,4 +1,4 @@
getJasmineRequireObj().util = function() {
getJasmineRequireObj().util = function(j$) {
var util = {};
@@ -55,6 +55,23 @@ getJasmineRequireObj().util = function() {
return cloned;
};
util.cloneArgs = function(args) {
var clonedArgs = [];
var argsAsArray = j$.util.argsToArray(args);
for(var i = 0; i < argsAsArray.length; i++) {
var str = Object.prototype.toString.apply(argsAsArray[i]),
primitives = /^\[object (Boolean|String|RegExp|Number)/;
// All falsey values are either primitives, `null`, or `undefined.
if (!argsAsArray[i] || str.match(primitives)) {
clonedArgs.push(argsAsArray[i]);
} else {
clonedArgs.push(j$.util.clone(argsAsArray[i]));
}
}
return clonedArgs;
};
util.getPropertyDescriptor = function(obj, methodName) {
var descriptor,
proto = obj;