* Copyright 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
@@ -49,7 +49,7 @@
/**
* Used to match ES6 template delimiters
- * http://people.mozilla.org/~jorendorff/es6-draft.html#sec-7.8.6
+ * http://people.mozilla.org/~jorendorff/es6-draft.html#sec-literals-string-literals
*/
var reEsTemplate = /\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g;
@@ -78,7 +78,7 @@
var contextProps = [
'Array', 'Boolean', 'Date', 'Error', 'Function', 'Math', 'Number', 'Object',
'RegExp', 'String', '_', 'attachEvent', 'clearTimeout', 'isFinite', 'isNaN',
- 'parseInt', 'setImmediate', 'setTimeout'
+ 'parseInt', 'setTimeout'
];
/** Used to fix the JScript [[DontEnum]] bug */
@@ -280,22 +280,29 @@
*/
function compareAscending(a, b) {
var ac = a.criteria,
- bc = b.criteria;
+ bc = b.criteria,
+ index = -1,
+ length = ac.length;
- // ensure a stable sort in V8 and other engines
- // http://code.google.com/p/v8/issues/detail?id=90
- if (ac !== bc) {
- if (ac > bc || typeof ac == 'undefined') {
- return 1;
- }
- if (ac < bc || typeof bc == 'undefined') {
- return -1;
+ while (++index < length) {
+ var value = ac[index],
+ other = bc[index];
+
+ if (value !== other) {
+ if (value > other || typeof value == 'undefined') {
+ return 1;
+ }
+ if (value < other || typeof other == 'undefined') {
+ return -1;
+ }
}
}
- // The JS engine embedded in Adobe applications like InDesign has a buggy
- // `Array#sort` implementation that causes it, under certain circumstances,
- // to return the same value for `a` and `b`.
- // See https://github.com/jashkenas/underscore/pull/1247
+ // Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications
+ // that causes it, under certain circumstances, to return the same value for
+ // `a` and `b`. See https://github.com/jashkenas/underscore/pull/1247
+ //
+ // This also ensures a stable sort in V8 and other engines.
+ // See http://code.google.com/p/v8/issues/detail?id=90
return a.index - b.index;
}
@@ -512,17 +519,12 @@
fnToString = Function.prototype.toString,
getPrototypeOf = reNative.test(getPrototypeOf = Object.getPrototypeOf) && getPrototypeOf,
hasOwnProperty = objectProto.hasOwnProperty,
- now = reNative.test(now = Date.now) && now || function() { return +new Date; },
push = arrayRef.push,
propertyIsEnumerable = objectProto.propertyIsEnumerable,
setTimeout = context.setTimeout,
splice = arrayRef.splice,
unshift = arrayRef.unshift;
- /** Used to detect `setImmediate` in Node.js */
- var setImmediate = typeof (setImmediate = freeGlobal && moduleExports && freeGlobal.setImmediate) == 'function' &&
- !reNative.test(setImmediate) && setImmediate;
-
/** Used to set meta data on functions */
var defineProperty = (function() {
// IE 8 only accepts DOM elements
@@ -2495,22 +2497,22 @@
}
/**
- * Checks if the specified object `property` exists and is a direct property,
+ * Checks if the specified property name exists as a direct property of `object`,
* instead of an inherited property.
*
* @static
* @memberOf _
* @category Objects
- * @param {Object} object The object to check.
- * @param {string} property The property to check for.
+ * @param {Object} object The object to inspect.
+ * @param {string} key The name of the property to check.
* @returns {boolean} Returns `true` if key is a direct property, else `false`.
* @example
*
* _.has({ 'a': 1, 'b': 2, 'c': 3 }, 'b');
* // => true
*/
- function has(object, property) {
- return object ? hasOwnProperty.call(object, property) : false;
+ function has(object, key) {
+ return object ? hasOwnProperty.call(object, key) : false;
}
/**
@@ -2523,7 +2525,7 @@
* @returns {Object} Returns the created inverted object.
* @example
*
- * _.invert({ 'first': 'fred', 'second': 'barney' });
+ * _.invert({ 'first': 'fred', 'second': 'barney' });
* // => { 'fred': 'first', 'barney': 'second' }
*/
function invert(object) {
@@ -2915,6 +2917,52 @@
return typeof value == 'undefined';
}
+ /**
+ * Creates an object with the same keys as `object` and values generated by
+ * running each own enumerable property of `object` through the callback.
+ * The callback is bound to `thisArg` and invoked with three arguments;
+ * (value, key, object).
+ *
+ * If a property name is provided for `callback` the created "_.pluck" style
+ * callback will return the property value of the given element.
+ *
+ * If an object is provided for `callback` the created "_.where" style callback
+ * will return `true` for elements that have the properties of the given object,
+ * else `false`.
+ *
+ * @static
+ * @memberOf _
+ * @category Objects
+ * @param {Object} object The object to iterate over.
+ * @param {Function|Object|string} [callback=identity] The function called
+ * per iteration. If a property name or object is provided it will be used
+ * to create a "_.pluck" or "_.where" style callback, respectively.
+ * @param {*} [thisArg] The `this` binding of `callback`.
+ * @returns {Array} Returns a new object with values of the results of each `callback` execution.
+ * @example
+ *
+ * _.mapValues({ 'a': 1, 'b': 2, 'c': 3} , function(num) { return num * 3; });
+ * // => { 'a': 3, 'b': 6, 'c': 9 }
+ *
+ * var characters = {
+ * 'fred': { 'name': 'fred', 'age': 40 },
+ * 'pebbles': { 'name': 'pebbles', 'age': 1 }
+ * };
+ *
+ * // using "_.pluck" callback shorthand
+ * _.mapValues(characters, 'age');
+ * // => { 'fred': 40, 'pebbles': 1 }
+ */
+ function mapValues(object, callback, thisArg) {
+ var result = {};
+ callback = lodash.createCallback(callback, thisArg, 3);
+
+ forOwn(object, function(value, key, object) {
+ result[key] = callback(value, key, object);
+ });
+ return result;
+ }
+
/**
* Recursively merges own enumerable properties of the source object(s), that
* don't resolve to `undefined` into the destination object. Subsequent sources
@@ -2973,7 +3021,6 @@
if (!isObject(object)) {
return object;
}
-
// allows working with `_.reduce` and `_.reduceRight` without using
// their `index` and `collection` arguments
if (typeof args[2] != 'number') {
@@ -3130,11 +3177,11 @@
/**
* An alternative to `_.reduce` this method transforms `object` to a new
- * `accumulator` object which is the result of running each of its elements
- * through a callback, with each callback execution potentially mutating
- * the `accumulator` object. The callback is bound to `thisArg` and invoked
- * with four arguments; (accumulator, value, key, object). Callbacks may exit
- * iteration early by explicitly returning `false`.
+ * `accumulator` object which is the result of running each of its own
+ * enumerable properties through a callback, with each callback execution
+ * potentially mutating the `accumulator` object. The callback is bound to
+ * `thisArg` and invoked with four arguments; (accumulator, value, key, object).
+ * Callbacks may exit iteration early by explicitly returning `false`.
*
* @static
* @memberOf _
@@ -3973,7 +4020,7 @@
* @type Function
* @category Collections
* @param {Array|Object|string} collection The collection to iterate over.
- * @param {string} property The property to pluck.
+ * @param {string} property The name of the property to pluck.
* @returns {Array} Returns a new array of property values.
* @example
*
@@ -4194,7 +4241,7 @@
* // => 3
*
* _.size('pebbles');
- * // => 5
+ * // => 7
*/
function size(collection) {
var length = collection ? collection.length : 0;
@@ -4274,6 +4321,9 @@
* If a property name is provided for `callback` the created "_.pluck" style
* callback will return the property value of the given element.
*
+ * If an array of property names is provided for `callback` the collection
+ * will be sorted by each property value.
+ *
* If an object is provided for `callback` the created "_.where" style callback
* will return `true` for elements that have the properties of the given object,
* else `false`.
@@ -4282,7 +4332,7 @@
* @memberOf _
* @category Collections
* @param {Array|Object|string} collection The collection to iterate over.
- * @param {Function|Object|string} [callback=identity] The function called
+ * @param {Array|Function|Object|string} [callback=identity] The function called
* per iteration. If a property name or object is provided it will be used
* to create a "_.pluck" or "_.where" style callback, respectively.
* @param {*} [thisArg] The `this` binding of `callback`.
@@ -4295,19 +4345,37 @@
* _.sortBy([1, 2, 3], function(num) { return this.sin(num); }, Math);
* // => [3, 1, 2]
*
+ * var characters = [
+ * { 'name': 'barney', 'age': 36 },
+ * { 'name': 'fred', 'age': 40 },
+ * { 'name': 'barney', 'age': 26 },
+ * { 'name': 'fred', 'age': 30 }
+ * ];
+ *
* // using "_.pluck" callback shorthand
- * _.sortBy(['banana', 'strawberry', 'apple'], 'length');
- * // => ['apple', 'banana', 'strawberry']
+ * _.map(_.sortBy(characters, 'age'), _.values);
+ * // => [['barney', 26], ['fred', 30], ['barney', 36], ['fred', 40]]
+ *
+ * // sorting by multiple properties
+ * _.map(_.sortBy(characters, ['name', 'age']), _.values);
+ * // = > [['barney', 26], ['barney', 36], ['fred', 30], ['fred', 40]]
*/
function sortBy(collection, callback, thisArg) {
var index = -1,
+ isArr = isArray(callback),
length = collection ? collection.length : 0,
result = Array(typeof length == 'number' ? length : 0);
- callback = lodash.createCallback(callback, thisArg, 3);
+ if (!isArr) {
+ callback = lodash.createCallback(callback, thisArg, 3);
+ }
forEach(collection, function(value, key, collection) {
var object = result[++index] = getObject();
- object.criteria = callback(value, key, collection);
+ if (isArr) {
+ object.criteria = map(callback, function(key) { return value[key]; });
+ } else {
+ (object.criteria = getArray())[0] = callback(value, key, collection);
+ }
object.index = index;
object.value = value;
});
@@ -4317,6 +4385,9 @@
while (length--) {
var object = result[length];
result[length] = object.value;
+ if (!isArr) {
+ releaseArray(object.criteria);
+ }
releaseObject(object);
}
return result;
@@ -4354,7 +4425,7 @@
* @type Function
* @category Collections
* @param {Array|Object|string} collection The collection to iterate over.
- * @param {Object} properties The object of property values to filter by.
+ * @param {Object} props The object of property values to filter by.
* @returns {Array} Returns a new array of elements that have the given properties.
* @example
*
@@ -4759,29 +4830,34 @@
* @memberOf _
* @category Arrays
* @param {...Array} [array] The arrays to inspect.
- * @returns {Array} Returns an array of composite values.
+ * @returns {Array} Returns an array of shared values.
* @example
*
- * _.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]);
+ * _.intersection([1, 2, 3], [5, 2, 1, 4], [2, 1]);
* // => [1, 2]
*/
- function intersection(array) {
- var args = arguments,
- argsLength = args.length,
+ function intersection() {
+ var args = [],
argsIndex = -1,
+ argsLength = arguments.length,
caches = getArray(),
- index = -1,
indexOf = getIndexOf(),
- length = array ? array.length : 0,
- result = [],
+ trustIndexOf = indexOf === baseIndexOf,
seen = getArray();
while (++argsIndex < argsLength) {
- var value = args[argsIndex];
- caches[argsIndex] = indexOf === baseIndexOf &&
- (value ? value.length : 0) >= largeArraySize &&
- createCache(argsIndex ? args[argsIndex] : seen);
+ var value = arguments[argsIndex];
+ if (isArray(value) || isArguments(value)) {
+ args.push(value);
+ caches.push(trustIndexOf && value.length >= largeArraySize &&
+ createCache(argsIndex ? args[argsIndex] : seen));
+ }
}
+ var array = args[0],
+ index = -1,
+ length = array ? array.length : 0,
+ result = [];
+
outer:
while (++index < length) {
var cache = caches[0];
@@ -5198,13 +5274,13 @@
* @memberOf _
* @category Arrays
* @param {...Array} [array] The arrays to inspect.
- * @returns {Array} Returns an array of composite values.
+ * @returns {Array} Returns an array of combined values.
* @example
*
- * _.union([1, 2, 3], [101, 2, 1, 10], [2, 1]);
- * // => [1, 2, 3, 101, 10]
+ * _.union([1, 2, 3], [5, 2, 1, 4], [2, 1]);
+ * // => [1, 2, 3, 5, 4]
*/
- function union(array) {
+ function union() {
return baseUniq(baseFlatten(arguments, true, true));
}
@@ -5284,6 +5360,38 @@
return baseDifference(array, slice(arguments, 1));
}
+ /**
+ * Creates an array that is the smymetric difference of the provided arrays.
+ * See http://en.wikipedia.org/wiki/Symmetric_difference.
+ *
+ * @static
+ * @memberOf _
+ * @category Arrays
+ * @param {...Array} [array] The arrays to inspect.
+ * @returns {Array} Returns an array of values.
+ * @example
+ *
+ * _.xor([1, 2, 3], [5, 2, 1, 4]);
+ * // => [3, 5, 4]
+ *
+ * _.xor([1, 2, 5], [2, 3, 5], [3, 4, 5]);
+ * // => [1, 4, 5]
+ */
+ function xor() {
+ var index = -1,
+ length = arguments.length;
+
+ while (++index < length) {
+ var array = arguments[index];
+ if (isArray(array) || isArguments(array)) {
+ var result = result
+ ? baseUniq(baseDifference(result, array).concat(baseDifference(array, result)))
+ : array;
+ }
+ }
+ return result || [];
+ }
+
/**
* Creates an array of grouped elements, the first of which contains the first
* elements of the given arrays, the second of which contains the second
@@ -5335,6 +5443,9 @@
length = keys ? keys.length : 0,
result = {};
+ if (!values && length && !isArray(keys[0])) {
+ values = [];
+ }
while (++index < length) {
var key = keys[index];
if (values) {
@@ -5427,8 +5538,8 @@
* @example
*
* var view = {
- * 'label': 'docs',
- * 'onClick': function() { console.log('clicked ' + this.label); }
+ * 'label': 'docs',
+ * 'onClick': function() { console.log('clicked ' + this.label); }
* };
*
* _.bindAll(view);
@@ -5537,74 +5648,6 @@
};
}
- /**
- * Produces a callback bound to an optional `thisArg`. If `func` is a property
- * name the created callback will return the property value for a given element.
- * If `func` is an object the created callback will return `true` for elements
- * that contain the equivalent object properties, otherwise it will return `false`.
- *
- * @static
- * @memberOf _
- * @category Functions
- * @param {*} [func=identity] The value to convert to a callback.
- * @param {*} [thisArg] The `this` binding of the created callback.
- * @param {number} [argCount] The number of arguments the callback accepts.
- * @returns {Function} Returns a callback function.
- * @example
- *
- * var characters = [
- * { 'name': 'barney', 'age': 36 },
- * { 'name': 'fred', 'age': 40 }
- * ];
- *
- * // wrap to create custom callback shorthands
- * _.createCallback = _.wrap(_.createCallback, function(func, callback, thisArg) {
- * var match = /^(.+?)__([gl]t)(.+)$/.exec(callback);
- * return !match ? func(callback, thisArg) : function(object) {
- * return match[2] == 'gt' ? object[match[1]] > match[3] : object[match[1]] < match[3];
- * };
- * });
- *
- * _.filter(characters, 'age__gt38');
- * // => [{ 'name': 'fred', 'age': 40 }]
- */
- function createCallback(func, thisArg, argCount) {
- var type = typeof func;
- if (func == null || type == 'function') {
- return baseCreateCallback(func, thisArg, argCount);
- }
- // handle "_.pluck" style callback shorthands
- if (type != 'object') {
- return function(object) {
- return object[func];
- };
- }
- var props = keys(func),
- key = props[0],
- a = func[key];
-
- // handle "_.where" style callback shorthands
- if (props.length == 1 && a === a && !isObject(a)) {
- // fast path the common case of providing an object with a single
- // property containing a primitive value
- return function(object) {
- var b = object[key];
- return a === b && (a !== 0 || (1 / a == 1 / b));
- };
- }
- return function(object) {
- var length = props.length,
- result = false;
-
- while (length--) {
- if (!(result = baseIsEqual(object[props[length]], func[props[length]], null, true))) {
- break;
- }
- }
- return result;
- };
- }
-
/**
* Creates a function which accepts one or more arguments of `func` that when
* invoked either executes `func` returning its result, if all `func` arguments
@@ -5790,8 +5833,8 @@
* @returns {number} Returns the timer id.
* @example
*
- * _.defer(function() { console.log('deferred'); });
- * // returns from the function before 'deferred' is logged
+ * _.defer(function(text) { console.log(text); }, 'deferred');
+ * // logs 'deferred' after one or more milliseconds
*/
function defer(func) {
if (!isFunction(func)) {
@@ -5800,15 +5843,6 @@
var args = slice(arguments, 1);
return setTimeout(function() { func.apply(undefined, args); }, 1);
}
- // use `setImmediate` if available in Node.js
- if (setImmediate) {
- defer = function(func) {
- if (!isFunction(func)) {
- throw new TypeError;
- }
- return setImmediate.apply(context, arguments);
- };
- }
/**
* Executes the `func` function after `wait` milliseconds. Additional arguments
@@ -5823,9 +5857,8 @@
* @returns {number} Returns the timer id.
* @example
*
- * var log = _.bind(console.log, console);
- * _.delay(log, 1000, 'logged later');
- * // => 'logged later' (Appears after one second.)
+ * _.delay(function(text) { console.log(text); }, 1000, 'later');
+ * // => logs 'later' after one second
*/
function delay(func, wait) {
if (!isFunction(func)) {
@@ -6056,6 +6089,93 @@
/*--------------------------------------------------------------------------*/
+ /**
+ * Creates a function that returns `value`.
+ *
+ * @static
+ * @memberOf _
+ * @category Utilities
+ * @param {*} value The value to return from the new function.
+ * @returns {Function} Returns the new function.
+ * @example
+ *
+ * var object = { 'name': 'fred' };
+ * var getter = _.constant(object);
+ * getter() === object;
+ * // => true
+ */
+ function constant(value) {
+ return function() {
+ return value;
+ };
+ }
+
+ /**
+ * Produces a callback bound to an optional `thisArg`. If `func` is a property
+ * name the created callback will return the property value for a given element.
+ * If `func` is an object the created callback will return `true` for elements
+ * that contain the equivalent object properties, otherwise it will return `false`.
+ *
+ * @static
+ * @memberOf _
+ * @category Utilities
+ * @param {*} [func=identity] The value to convert to a callback.
+ * @param {*} [thisArg] The `this` binding of the created callback.
+ * @param {number} [argCount] The number of arguments the callback accepts.
+ * @returns {Function} Returns a callback function.
+ * @example
+ *
+ * var characters = [
+ * { 'name': 'barney', 'age': 36 },
+ * { 'name': 'fred', 'age': 40 }
+ * ];
+ *
+ * // wrap to create custom callback shorthands
+ * _.createCallback = _.wrap(_.createCallback, function(func, callback, thisArg) {
+ * var match = /^(.+?)__([gl]t)(.+)$/.exec(callback);
+ * return !match ? func(callback, thisArg) : function(object) {
+ * return match[2] == 'gt' ? object[match[1]] > match[3] : object[match[1]] < match[3];
+ * };
+ * });
+ *
+ * _.filter(characters, 'age__gt38');
+ * // => [{ 'name': 'fred', 'age': 40 }]
+ */
+ function createCallback(func, thisArg, argCount) {
+ var type = typeof func;
+ if (func == null || type == 'function') {
+ return baseCreateCallback(func, thisArg, argCount);
+ }
+ // handle "_.pluck" style callback shorthands
+ if (type != 'object') {
+ return property(func);
+ }
+ var props = keys(func),
+ key = props[0],
+ a = func[key];
+
+ // handle "_.where" style callback shorthands
+ if (props.length == 1 && a === a && !isObject(a)) {
+ // fast path the common case of providing an object with a single
+ // property containing a primitive value
+ return function(object) {
+ var b = object[key];
+ return a === b && (a !== 0 || (1 / a == 1 / b));
+ };
+ }
+ return function(object) {
+ var length = props.length,
+ result = false;
+
+ while (length--) {
+ if (!(result = baseIsEqual(object[props[length]], func[props[length]], null, true))) {
+ break;
+ }
+ }
+ return result;
+ };
+ }
+
/**
* Converts the characters `&`, `<`, `>`, `"`, and `'` in `string` to their
* corresponding HTML entities.
@@ -6093,51 +6213,71 @@
}
/**
- * Adds function properties of a source object to the `lodash` function and
- * chainable wrapper.
+ * Adds function properties of a source object to the destination object.
+ * If `object` is a function methods will be added to its prototype as well.
*
* @static
* @memberOf _
* @category Utilities
- * @param {Object} object The object of function properties to add to `lodash`.
- * @param {Object} object The object of function properties to add to `lodash`.
+ * @param {Function|Object} [object=lodash] object The destination object.
+ * @param {Object} source The object of functions to add.
+ * @param {Object} [options] The options object.
+ * @param {boolean} [options.chain=true] Specify whether the functions added are chainable.
* @example
*
- * _.mixin({
- * 'capitalize': function(string) {
- * return string.charAt(0).toUpperCase() + string.slice(1).toLowerCase();
- * }
- * });
+ * function capitalize(string) {
+ * return string.charAt(0).toUpperCase() + string.slice(1).toLowerCase();
+ * }
*
+ * _.mixin({ 'capitalize': capitalize });
* _.capitalize('fred');
* // => 'Fred'
*
+ * _('fred').capitalize().value();
+ * // => 'Fred'
+ *
+ * _.mixin({ 'capitalize': capitalize }, { 'chain': false });
* _('fred').capitalize();
* // => 'Fred'
*/
- function mixin(object, source) {
- var ctor = object,
- isFunc = !source || isFunction(ctor);
+ function mixin(object, source, options) {
+ var chain = true,
+ methodNames = source && functions(source);
- if (!source) {
+ if (!source || (!options && !methodNames.length)) {
+ if (options == null) {
+ options = source;
+ }
ctor = lodashWrapper;
source = object;
object = lodash;
+ methodNames = functions(source);
}
- forEach(functions(source), function(methodName) {
+ if (options === false) {
+ chain = false;
+ } else if (isObject(options) && 'chain' in options) {
+ chain = options.chain;
+ }
+ var ctor = object,
+ isFunc = isFunction(ctor);
+
+ forEach(methodNames, function(methodName) {
var func = object[methodName] = source[methodName];
if (isFunc) {
ctor.prototype[methodName] = function() {
- var value = this.__wrapped__,
+ var chainAll = this.__chain__,
+ value = this.__wrapped__,
args = [value];
push.apply(args, arguments);
var result = func.apply(object, args);
- if (value && typeof value == 'object' && value === result) {
- return this;
+ if (chain || chainAll) {
+ if (value === result && isObject(result)) {
+ return this;
+ }
+ result = new ctor(result);
+ result.__chain__ = chainAll;
}
- result = new ctor(result);
- result.__chain__ = this.__chain__;
return result;
};
}
@@ -6177,6 +6317,23 @@
// no operation performed
}
+ /**
+ * Gets the number of milliseconds that have elapsed since the Unix epoch
+ * (1 January 1970 00:00:00 UTC).
+ *
+ * @static
+ * @memberOf _
+ * @category Utilities
+ * @example
+ *
+ * var stamp = _.now();
+ * _.defer(function() { console.log(_.now() - stamp); });
+ * // => logs the number of milliseconds it took for the deferred function to be called
+ */
+ var now = reNative.test(now = Date.now) && now || function() {
+ return new Date().getTime();
+ };
+
/**
* Converts the given value into an integer of the specified radix.
* If `radix` is `undefined` or `0` a `radix` of `10` is used unless the
@@ -6201,6 +6358,36 @@
return nativeParseInt(isString(value) ? value.replace(reLeadingSpacesAndZeros, '') : value, radix || 0);
};
+ /**
+ * Creates a "_.pluck" style function, which returns the `key` value of a
+ * given object.
+ *
+ * @static
+ * @memberOf _
+ * @category Utilities
+ * @param {string} key The name of the property to retrieve.
+ * @returns {Function} Returns the new function.
+ * @example
+ *
+ * var characters = [
+ * { 'name': 'fred', 'age': 40 },
+ * { 'name': 'barney', 'age': 36 }
+ * ];
+ *
+ * var getName = _.property('name');
+ *
+ * _.map(characters, getName);
+ * // => ['barney', 'fred']
+ *
+ * _.sortBy(characters, getName);
+ * // => [{ 'name': 'barney', 'age': 36 }, { 'name': 'fred', 'age': 40 }]
+ */
+ function property(key) {
+ return function(object) {
+ return object[key];
+ };
+ }
+
/**
* Produces a random number between `min` and `max` (inclusive). If only one
* argument is provided a number between `0` and the given number will be
@@ -6260,7 +6447,7 @@
}
/**
- * Resolves the value of `property` on `object`. If `property` is a function
+ * Resolves the value of property `key` on `object`. If `key` is a function
* it will be invoked with the `this` binding of `object` and its result returned,
* else the property value is returned. If `object` is falsey then `undefined`
* is returned.
@@ -6269,7 +6456,7 @@
* @memberOf _
* @category Utilities
* @param {Object} object The object to inspect.
- * @param {string} property The property to get the value of.
+ * @param {string} key The name of the property to resolve.
* @returns {*} Returns the resolved value.
* @example
*
@@ -6286,10 +6473,10 @@
* _.result(object, 'stuff');
* // => 'nonsense'
*/
- function result(object, property) {
+ function result(object, key) {
if (object) {
- var value = object[property];
- return isFunction(value) ? object[property]() : value;
+ var value = object[key];
+ return isFunction(value) ? object[key]() : value;
}
}
@@ -6353,8 +6540,8 @@
* // => 'hello mustache!'
*
* // using the `imports` option to import jQuery
- * var list = '<% $.each(people, function(name) { %><%- name %><% }); %>';
- * _.template(list, { 'people': ['fred', 'barney'] }, { 'imports': { '$': jQuery } });
+ * var list = '<% jq.each(people, function(name) { %><%- name %><% }); %>';
+ * _.template(list, { 'people': ['fred', 'barney'] }, { 'imports': { 'jq': jQuery } });
* // => 'fredbarney'
*
* // using the `sourceURL` option to specify a custom sourceURL for the template
@@ -6633,7 +6820,7 @@
* _(characters).chain()
* .first()
* .pick('age')
- * .value()
+ * .value();
* // => { 'age': 36 }
*/
function wrapperChain() {
@@ -6686,6 +6873,7 @@
lodash.chain = chain;
lodash.compact = compact;
lodash.compose = compose;
+ lodash.constant = constant;
lodash.countBy = countBy;
lodash.create = create;
lodash.createCallback = createCallback;
@@ -6712,6 +6900,7 @@
lodash.invoke = invoke;
lodash.keys = keys;
lodash.map = map;
+ lodash.mapValues = mapValues;
lodash.max = max;
lodash.memoize = memoize;
lodash.merge = merge;
@@ -6723,6 +6912,7 @@
lodash.partialRight = partialRight;
lodash.pick = pick;
lodash.pluck = pluck;
+ lodash.property = property;
lodash.pull = pull;
lodash.range = range;
lodash.reject = reject;
@@ -6741,6 +6931,7 @@
lodash.where = where;
lodash.without = without;
lodash.wrap = wrap;
+ lodash.xor = xor;
lodash.zip = zip;
lodash.zipObject = zipObject;
@@ -6798,6 +6989,7 @@
lodash.mixin = mixin;
lodash.noConflict = noConflict;
lodash.noop = noop;
+ lodash.now = now;
lodash.parseInt = parseInt;
lodash.random = random;
lodash.reduce = reduce;
@@ -6821,20 +7013,15 @@
lodash.include = contains;
lodash.inject = reduce;
- forOwn(lodash, function(func, methodName) {
- if (!lodash.prototype[methodName]) {
- lodash.prototype[methodName] = function() {
- var args = [this.__wrapped__],
- chainAll = this.__chain__;
-
- push.apply(args, arguments);
- var result = func.apply(lodash, args);
- return chainAll
- ? new lodashWrapper(result, chainAll)
- : result;
- };
- }
- });
+ mixin(function() {
+ var source = {}
+ forOwn(lodash, function(func, methodName) {
+ if (!lodash.prototype[methodName]) {
+ source[methodName] = func;
+ }
+ });
+ return source;
+ }(), false);
/*--------------------------------------------------------------------------*/
@@ -6870,7 +7057,7 @@
* @memberOf _
* @type string
*/
- lodash.VERSION = '2.3.0';
+ lodash.VERSION = '2.4.0';
// add "Chaining" functions to the wrapper
lodash.prototype.chain = wrapperChain;
@@ -6891,7 +7078,7 @@
};
});
- // add `Array` functions that return the wrapped value
+ // add `Array` functions that return the existing wrapped value
baseEach(['push', 'reverse', 'sort', 'unshift'], function(methodName) {
var func = arrayRef[methodName];
lodash.prototype[methodName] = function() {
@@ -6946,9 +7133,8 @@
// some AMD build optimizers like r.js check for condition patterns like the following:
if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
// Expose Lo-Dash to the global object even when an AMD loader is present in
- // case Lo-Dash was injected by a third-party script and not intended to be
- // loaded as a module. The global assignment can be reverted in the Lo-Dash
- // module by its `noConflict()` method.
+ // case Lo-Dash is loaded with a RequireJS shim config.
+ // See http://requirejs.org/docs/api.html#config-shim
root._ = _;
// define as an anonymous module so, through path mapping, it can be
diff --git a/package.json b/package.json
index cc04b94bca..bec82e5179 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "lodash",
- "version": "2.3.0",
+ "version": "2.4.0",
"description": "A utility library delivering consistency, customization, performance, & extras.",
"homepage": "http://lodash.com/",
"license": "MIT",
diff --git a/test/asset/qunit-extras.js b/test/asset/qunit-extras.js
new file mode 100644
index 0000000000..3f54a89396
--- /dev/null
+++ b/test/asset/qunit-extras.js
@@ -0,0 +1,198 @@
+;(function(root, undefined) {
+ 'use strict';
+
+ /** Native method shortcut */
+ var unshift = Array.prototype.unshift;
+
+ /** Used to match HTML entities */
+ var reEscapedHtml = /(&|<|>|"|')/g;
+
+ /** Used to match parts of the assert message */
+ var reDied = /^Died on test #\d+/,
+ reExpected = /Expected: *<\/th>([\s\S]*?)<\/pre>/,
+ reMessage = /^([\s\S]*?)<\/span>/;
+
+ /** Used to convert HTML entities to characters */
+ var htmlUnescapes = {
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ ''': "'"
+ };
+
+ /** Detect free variable `exports` */
+ var freeExports = typeof exports == 'object' && exports;
+
+ /** Detect free variable `global`, from Node.js or Browserified code, and use it as `root` */
+ var freeGlobal = typeof global == 'object' && global;
+ if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
+ root = freeGlobal;
+ }
+
+ /*--------------------------------------------------------------------------*/
+
+ /**
+ * Checks if a given value is present in an array using strict equality
+ * for comparisons, i.e. `===`.
+ *
+ * @oruvate
+ * @param {Array} array The array to iterate over.
+ * @param {*} target The value to check for.
+ * @returns {boolean} Returns `true` if the `target` element is found, else `false`.
+ */
+ function contains(array, value) {
+ var index = -1,
+ length = array ? array.length : 0;
+
+ while (++index < length) {
+ if (array[index] === value) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Resolves the value of `property` on `object`. If `object` is falsey then
+ * `undefined` is returned.
+ *
+ * @private
+ * @param {Object} object The object to inspect.
+ * @param {string} property The property to get the value of.
+ * @returns {*} Returns the resolved value.
+ */
+ function result(object, property) {
+ return object ? object[property] : undefined;
+ }
+
+ /**
+ * Converts the HTML entities `&`, `<`, `>`, `"`, and `'`
+ * in `string` to their corresponding characters.
+ *
+ * @private
+ * @param {string} string The string to unescape.
+ * @returns {string} Returns the unescaped string.
+ */
+ function unescape(string) {
+ return string == null ? '' : String(string).replace(reEscapedHtml, unescapeHtmlChar);
+ }
+
+ /**
+ * Used by `unescape` to convert HTML entities to characters.
+ *
+ * @private
+ * @param {string} match The matched character to unescape.
+ * @returns {string} Returns the unescaped character.
+ */
+ function unescapeHtmlChar(match) {
+ return htmlUnescapes[match];
+ }
+
+ /*--------------------------------------------------------------------------*/
+
+ /**
+ * Installs the QUnit additions on the given `context` object.
+ *
+ * @memberOf exports
+ * @param {Object} context The context object.
+ */
+ function runInContext(context) {
+ // exit early if no `context` is provided or if `QUnit` does not exist
+ if (!context || !context.QUnit) {
+ return;
+ }
+
+ /** Shorten `context.QUnit.QUnit` to `context.QUnit` */
+ var QUnit = context.QUnit = context.QUnit.QUnit || context.QUnit;
+
+ /** The number of retries async tests have to succeed */
+ QUnit.config.asyncRetries = 0;
+
+ /** An object of excused tests and assertions */
+ QUnit.config.excused = {};
+
+ /**
+ * A callback triggered at the start of every test.
+ *
+ * @memberOf QUnit
+ * @param {Object} details An object with `module` and `name` properties.
+ */
+ QUnit.testStart(function(details) {
+ var excused = QUnit.config.excused || {},
+ excusedTests = excused[details.module],
+ excusedAsserts = excusedTests && excusedTests[details.name];
+
+ var test = QUnit.config.current,
+ finish = test.finish;
+
+ // allow async tests to retry
+ if (test.async && !test.retries) {
+ test.retries = 0;
+ test.finish = function() {
+ var asserts = this.assertions,
+ index = -1,
+ length = asserts.length,
+ queue = QUnit.config.queue;
+
+ while (++index < length) {
+ var assert = asserts[index];
+ if (!assert.result && this.retries < QUnit.config.asyncRetries) {
+ this.retries++;
+ asserts.length = 0;
+
+ var oldLength = queue.length;
+ this.queue();
+ unshift.apply(queue, queue.splice(oldLength, queue.length - oldLength));
+ return;
+ }
+ }
+ finish.call(this);
+ };
+ }
+ // nothing to excuse
+ if (!excusedAsserts) {
+ return;
+ }
+ // excuse the entire test
+ if (excusedAsserts === true) {
+ test.async = false;
+ test.callback = function() {};
+ test.expected = 0;
+ return;
+ }
+ // excuse specific assertions
+ test.finish = function() {
+ var asserts = this.assertions,
+ index = -1,
+ length = asserts.length;
+
+ while (++index < length) {
+ var assert = asserts[index],
+ message = unescape(result(reMessage.exec(assert.message), 1)),
+ died = result(reDied.exec(message), 0),
+ expected = unescape(result(reExpected.exec(assert.message), 1));
+
+ if ((message && contains(excusedAsserts, message)) ||
+ (died && contains(excusedAsserts, died)) ||
+ (expected && (
+ contains(excusedAsserts, expected) ||
+ contains(excusedAsserts, expected.replace(/\s+/g, ''))
+ ))) {
+ assert.result = true;
+ }
+ }
+ finish.call(this);
+ };
+ });
+ }
+
+ /*--------------------------------------------------------------------------*/
+
+ // expose QUnit extras
+ if (freeExports && !freeExports.nodeType) {
+ freeExports.runInContext = runInContext;
+ } else {
+ runInContext(root);
+ }
+}(this));
diff --git a/test/backbone.html b/test/backbone.html
index 8b9fa6be66..e3ebac16ac 100644
--- a/test/backbone.html
+++ b/test/backbone.html
@@ -22,76 +22,38 @@ Test
+
+
@@ -80,12 +81,12 @@
global_test_results = results;
});
- // load Lo-Dash again to overwrite the existing `_` value
- document.write('
@@ -155,8 +156,8 @@
underscoreModule = underscore.noConflict();
underscoreModule.moduleName = 'underscore';
}
- if (lodash && lodash.noConflict) {
- lodashModule = lodash.noConflict();
+ if (lodash) {
+ lodashModule = lodash;
lodashModule.moduleName = 'lodash';
}
if (ui.isModularize) {
diff --git a/test/saucelabs.js b/test/saucelabs.js
index 63b4209366..e32e0034bb 100644
--- a/test/saucelabs.js
+++ b/test/saucelabs.js
@@ -1,48 +1,75 @@
;(function() {
'use strict';
- var ecstatic = require('ecstatic'),
- http = require('http'),
+ /** Environment shortcut */
+ var env = process.env;
+
+ if (isFinite(env.TRAVIS_PULL_REQUEST)) {
+ console.error('Testing skipped for pull requests');
+ process.exit(0);
+ }
+
+ /** Load Node.js modules */
+ var http = require('http'),
path = require('path'),
- request = require('request'),
- SauceTunnel = require('sauce-tunnel'),
url = require('url');
- var attempts = -1,
- prevLine = '';
+ /** Load other modules */
+ var _ = require('../lodash.js'),
+ ecstatic = require('ecstatic'),
+ request = require('request'),
+ SauceTunnel = require('sauce-tunnel');
- var port = 8081,
- username = process.env.SAUCE_USERNAME,
- accessKey = process.env.SAUCE_ACCESS_KEY,
- tunnelId = 'lodash_' + process.env.TRAVIS_JOB_NUMBER;
+ /** Used by `logInline` to clear previously logged messages */
+ var prevLine = '';
- if (isFinite(process.env.TRAVIS_PULL_REQUEST)) {
- console.error('Testing skipped for pull requests');
- process.exit(0);
- }
+ /** Used to display the wait throbber */
+ var throbberId,
+ throbberDelay = 500,
+ waitCount = -1;
- var runnerPathname = (function() {
- var args = process.argv;
- return args.length > 2
- ? '/' + args[args.length - 1].replace(/^\W+/, '')
- : '/test/index.html';
- }());
+ /** Used as request `auth` and `options` values */
+ var accessKey = env.SAUCE_ACCESS_KEY,
+ build = env.TRAVIS_COMMIT.slice(0, 10),
+ port = 9001,
+ tunnelId = 'lodash_' + env.TRAVIS_JOB_NUMBER,
+ username = env.SAUCE_USERNAME;
- var runnerQuery = url.parse(runnerPathname, true).query,
- isBackbone = /\bbackbone\b/i.test(runnerPathname),
- isMobile = /\bmobile\b/i.test(runnerQuery.build),
- isModern = /\bmodern\b/i.test(runnerQuery.build);
+ var compatMode = process.argv.reduce(function(result, value) {
+ return optionToValue('compatMode', value) || result;
+ }, null);
+
+ var runner = process.argv.reduce(function(result, value) {
+ value = optionToValue('runner', value);
+ return value == null
+ ? result
+ : '/' + value.replace(/^\W+/, '');
+ }, '/test/index.html');
+ var sessionName = process.argv.reduce(function(result, value) {
+ return optionToValue('name', value) || result;
+ }, 'lodash tests');
+
+ var tags = process.argv.reduce(function(result, value) {
+ value = optionToArray('tags', value);
+ return value.length
+ ? _.union(result, value)
+ : result;
+ }, []);
+
+ /** List of platforms to load the runner on */
var platforms = [
- ['Windows 7', 'chrome', ''],
- ['Windows 7', 'firefox', '25'],
- ['Windows 7', 'firefox', '20'],
- ['Windows 7', 'firefox', '10'],
- ['Windows 7', 'firefox', '6'],
- ['Windows 7', 'firefox', '4'],
- ['Windows 7', 'firefox', '3'],
- ['WIN8.1', 'internet explorer', '11'],
- ['Windows 7', 'internet explorer', '10'],
+ ['Windows 8.1', 'chrome', '31'],
+ ['Windows 8.1', 'chrome', '28'],
+ ['Windows 8.1', 'chrome', '26'],
+ ['OS X 10.6', 'firefox', '25'],
+ ['OS X 10.6', 'firefox', '20'],
+ ['OS X 10.6', 'firefox', '10'],
+ ['OS X 10.6', 'firefox', '6'],
+ ['OS X 10.6', 'firefox', '4'],
+ ['Windows 7', 'firefox', '3.6'],
+ ['Windows 8.1', 'internet explorer', '11'],
+ ['Windows 8', 'internet explorer', '10'],
['Windows 7', 'internet explorer', '9'],
['Windows 7', 'internet explorer', '8'],
['Windows XP', 'internet explorer', '7'],
@@ -50,14 +77,21 @@
//['Windows 7', 'opera', '12'],
//['Windows 7', 'opera', '11'],
['OS X 10.8', 'safari', '6'],
- ['Windows 7', 'safari', '5']
+ ['Windows 7', 'safari', '5'],
+ ['Windows XP', 'safari', '4']
];
+ /** Used to tailor the `platforms` array */
+ var runnerQuery = url.parse(runner, true).query,
+ isBackbone = /\bbackbone\b/i.test(runner),
+ isMobile = /\bmobile\b/i.test(runnerQuery.build),
+ isModern = /\bmodern\b/i.test(runnerQuery.build);
+
// platforms to test IE compat mode
- if (runnerQuery.compat) {
+ if (compatMode) {
platforms = [
- ['WIN8.1', 'internet explorer', '11'],
- ['Windows 7', 'internet explorer', '10'],
+ ['Windows 8.1', 'internet explorer', '11'],
+ ['Windows 8', 'internet explorer', '10'],
['Windows 7', 'internet explorer', '9'],
['Windows 7', 'internet explorer', '8']
];
@@ -85,45 +119,20 @@
case 'firefox': return version >= 10;
case 'internet explorer': return version >= 9;
case 'opera': return version >= 12;
- case 'safari': return version >= (isMobile ? 5 : 6);
+ case 'safari': return version >= (isMobile ? 3 : 6);
}
return true;
});
}
- // create a web server for the local dir
- var mount = ecstatic({
- 'root': process.cwd(),
- 'cache': false
- });
-
- http.createServer(function(req, res) {
- var compat = url.parse(req.url, true).query.compat;
- if (compat) {
- // see http://msdn.microsoft.com/en-us/library/ff955275(v=vs.85).aspx
- res.setHeader('X-UA-Compatible', 'IE=' + compat);
- }
- mount(req, res);
- }).listen(port);
-
- // set up Sauce Connect so we can use this server from Sauce Labs
- var tunnelTimeout = 10000,
- tunnel = new SauceTunnel(username, accessKey, tunnelId, true, tunnelTimeout);
-
- console.log('Opening Sauce Connect tunnel...');
-
- tunnel.start(function(success) {
- if (success) {
- console.log('Sauce Connect tunnel opened');
- runTests();
- } else {
- console.error('Failed to open Sauce Connect tunnel');
- process.exit(2);
- }
- });
-
/*--------------------------------------------------------------------------*/
+ /**
+ * Writes an inline message to standard output.
+ *
+ * @private
+ * @param {string} text The text to log.
+ */
function logInline(text) {
var blankLine = repeat(' ', prevLine.length);
if (text.length > 40) {
@@ -133,25 +142,124 @@
process.stdout.write(text + blankLine.slice(text.length) + '\r');
}
- function repeat(text, times) {
- return Array(times + 1).join(text);
+ /**
+ * Writes the wait throbber to standard output.
+ *
+ * @private
+ */
+ function logThrobber() {
+ logInline('Please wait' + repeat('.', (++waitCount % 3) + 1));
+ }
+
+ /**
+ * Converts a comma separated option value into an array.
+ *
+ * @private
+ * @param {string} name The name of the option to inspect.
+ * @param {string} string The options string.
+ * @returns {Array} Returns the new converted array.
+ */
+ function optionToArray(name, string) {
+ return _.compact(_.isArray(string)
+ ? string
+ : _.invoke((optionToValue(name, string) || '').split(/, */), 'trim')
+ );
+ }
+
+ /**
+ * Extracts the option value from an option string.
+ *
+ * @private
+ * @param {string} name The name of the option to inspect.
+ * @param {string} string The options string.
+ * @returns {string|undefined} Returns the option value, else `undefined`.
+ */
+ function optionToValue(name, string) {
+ var result = (result = string.match(RegExp('^' + name + '=([\\s\\S]+)$'))) && result[1].trim();
+ return result || undefined;
+ }
+
+ /**
+ * Creates a string with `text` repeated `n` number of times.
+ *
+ * @private
+ * @param {string} text The text to repeat.
+ * @param {number} n The number of times to repeat `text`.
+ * @returns {string} The created string.
+ */
+ function repeat(text, n) {
+ return Array(n + 1).join(text);
}
/*--------------------------------------------------------------------------*/
+ /**
+ * Processes the result object of the test session.
+ *
+ * @private
+ * @param {Object} results The result object to process.
+ */
+ function handleTestResults(results) {
+ var failingTests = results.filter(function(test) {
+ var result = test.result;
+ return !result || result.failed || /\berror\b/i.test(result.message);
+ });
+
+ var failingPlatforms = failingTests.map(function(test) {
+ return test.platform;
+ });
+
+ if (!failingTests.length) {
+ console.log('Tests passed');
+ }
+ else {
+ console.error('Tests failed on platforms: ' + JSON.stringify(failingPlatforms));
+
+ failingTests.forEach(function(test) {
+ var details = 'See ' + test.url + ' for details.',
+ platform = JSON.stringify(test.platform),
+ result = test.result;
+
+ if (result && result.failed) {
+ console.error(result.failed + ' failures on ' + platform + '. ' + details);
+ } else {
+ console.error('Testing on ' + platform + ' failed; no results available. ' + details);
+ }
+ });
+ }
+
+ clearInterval(throbberId);
+ console.log('Shutting down Sauce Connect tunnel...');
+
+ tunnel.stop(function() {
+ process.exit(failingTests.length ? 1 : 0);
+ });
+ }
+
+ /**
+ * Makes a request for Sauce Labs to start the test session.
+ *
+ * @private
+ */
function runTests() {
- var testDefinition = {
+ var options = {
+ 'build': build,
'framework': 'qunit',
+ 'name': sessionName,
+ 'public': 'public',
'platforms': platforms,
+ 'record-screenshots': false,
+ 'tags': tags,
'tunnel': 'tunnel-identifier:' + tunnelId,
- 'url': 'http://localhost:' + port + runnerPathname
+ 'url': 'http://localhost:' + port + runner,
+ 'video-upload-on-pass': false
};
- console.log('Starting saucelabs tests: ' + JSON.stringify(testDefinition));
+ console.log('Starting saucelabs tests: ' + JSON.stringify(options));
request.post('https://saucelabs.com/rest/v1/' + username + '/js-tests', {
'auth': { 'user': username, 'pass': accessKey },
- 'json': testDefinition
+ 'json': options
}, function(error, response, body) {
var statusCode = response && response.statusCode;
if (statusCode == 200) {
@@ -164,8 +272,22 @@
process.exit(3);
}
});
+
+ // initialize the wait throbber
+ if (!throbberId) {
+ throbberId = setInterval(logThrobber, throbberDelay);
+ logThrobber();
+ }
}
+ /**
+ * Checks the status of the test session. If the session has completed it
+ * passes the result object to `handleTestResults`, else it checks the status
+ * again in five seconds.
+ *
+ * @private
+ * @param {Object} testIdentifier The object used to identify the session.
+ */
function waitForTestCompletion(testIdentifier) {
request.post('https://saucelabs.com/rest/v1/' + username + '/js-tests/status', {
'auth': { 'user': username, 'pass': accessKey },
@@ -178,7 +300,6 @@
handleTestResults(body['js tests']);
}
else {
- logInline('Please wait' + repeat('.', (++attempts % 3) + 1));
setTimeout(function() {
waitForTestCompletion(testIdentifier);
}, 5000);
@@ -194,39 +315,35 @@
});
}
- function handleTestResults(results) {
- var failingTests = results.filter(function(test) {
- var result = test.result;
- return !result || result.failed || /\berror\b/i.test(result.message);
- });
+ /*--------------------------------------------------------------------------*/
- var failingPlatforms = failingTests.map(function(test) {
- return test.platform;
- });
+ // create a web server for the local dir
+ var mount = ecstatic({
+ 'cache': false,
+ 'root': process.cwd()
+ });
- if (!failingTests.length) {
- console.log('Tests passed');
+ http.createServer(function(req, res) {
+ // see http://msdn.microsoft.com/en-us/library/ff955275(v=vs.85).aspx
+ if (compatMode && path.extname(url.parse(req.url).pathname) == '.html') {
+ res.setHeader('X-UA-Compatible', 'IE=' + compatMode);
}
- else {
- console.error('Tests failed on platforms: ' + JSON.stringify(failingPlatforms));
-
- failingTests.forEach(function(test) {
- var details = 'See ' + test.url + ' for details.',
- platform = JSON.stringify(test.platform),
- result = test.result;
+ mount(req, res);
+ }).listen(port);
- if (result && result.failed) {
- console.error(result.failed + ' failures on ' + platform + '. ' + details);
- } else {
- console.error('Testing on ' + platform + ' failed; no results available. ' + details);
- }
- });
- }
+ // set up Sauce Connect so we can use this server from Sauce Labs
+ var tunnelTimeout = 10000,
+ tunnel = new SauceTunnel(username, accessKey, tunnelId, true, tunnelTimeout);
- console.log('Shutting down Sauce Connect tunnel...');
+ console.log('Opening Sauce Connect tunnel...');
- tunnel.stop(function() {
- process.exit(failingTests.length ? 1 : 0);
- });
- }
+ tunnel.start(function(success) {
+ if (success) {
+ console.log('Sauce Connect tunnel opened');
+ runTests();
+ } else {
+ console.error('Failed to open Sauce Connect tunnel');
+ process.exit(2);
+ }
+ });
}());
diff --git a/test/test.js b/test/test.js
index ae34ef654f..b548d315bc 100644
--- a/test/test.js
+++ b/test/test.js
@@ -8,6 +8,7 @@
body = document && document.body,
create = Object.create,
freeze = Object.freeze,
+ noop = function() {},
params = root.arguments,
process = root.process,
push = Array.prototype.push,
@@ -35,12 +36,11 @@
var last = result[result.length - 1];
result = (result.length > min && !/test(?:\.js)?$/.test(last)) ? last : '../lodash.js';
- try {
- if (!amd) {
+ if (!amd) {
+ try {
return require('fs').realpathSync(result);
- }
- } catch(e) { }
-
+ } catch(e) { }
+ }
return result;
}());
@@ -60,18 +60,22 @@
/** Detect if testing `npm` modules */
var isNpm = isModularize && /\bnpm\b/.test([ui.buildPath, ui.urlParams.build]);
+ /** Detect if running in Java */
+ var isJava = !document && !!root.java;
+
/** Detects if running in a PhantomJS web page */
var isPhantomPage = typeof callPhantom == 'function';
/** Detect if running in Rhino */
- var isRhino = root.java && typeof global == 'function' && global().Array === root.Array;
+ var isRhino = isJava && typeof global == 'function' && global().Array === root.Array;
/** Use a single "load" function */
- var load = !amd && typeof require == 'function' ? require : root.load;
+ var load = (typeof require == 'function' && !amd)
+ ? require
+ : (isJava && root.load);
/** The unit testing framework */
var QUnit = (function() {
- var noop = Function.prototype;
return root.QUnit || (
root.addEventListener || (root.addEventListener = noop),
root.setTimeout || (root.setTimeout = noop),
@@ -84,6 +88,10 @@
/*--------------------------------------------------------------------------*/
+ // load QUnit extras
+ if (load) {
+ (load('./asset/qunit-extras.js') || { 'runInContext': noop }).runInContext(root);
+ }
// log params passed to `test.js`
if (params) {
console.log('test.js invoked with arguments: ' + JSON.stringify(slice.call(params)));
@@ -183,34 +191,53 @@
/*--------------------------------------------------------------------------*/
- // add object from iframe
+ // add values from other realms
(function() {
- if (!document) {
- return;
+ if (!amd) {
+ try {
+ _.extend(_, require('vm').runInNewContext([
+ '({',
+ "'_arguments': (function() { return arguments; }(1, 2, 3)),",
+ "'_array': [1, 2, 3],",
+ "'_boolean': new Boolean(false),",
+ "'_date': new Date,",
+ "'_function': function() {},",
+ "'_nan': NaN,",
+ "'_null': null,",
+ "'_number': new Number(0),",
+ "'_object': { 'a': 1, 'b': 2, 'c': 3 },",
+ "'_regexp': /x/,",
+ "'_string': new String('a'),",
+ "'_undefined': undefined,",
+ '})'
+ ].join('\n')));
+ } catch(e) { }
+ }
+ if (!_._object && document) {
+ var iframe = document.createElement('iframe');
+ iframe.frameBorder = iframe.height = iframe.width = 0;
+ body.appendChild(iframe);
+
+ var idoc = (idoc = iframe.contentDocument || iframe.contentWindow).document || idoc;
+ idoc.write([
+ '
+
|