From 09e0f4e36cb6ce1524fd63a2fb82e528be0bf71a Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Mon, 11 Nov 2013 09:27:49 -0800 Subject: [PATCH] Move `ui.isModularize` lower in test-ui.js, tweak timing tests, and update lodash-es6 link in readme. --- README.md | 2 +- test/asset/test-ui.js | 6 +++--- test/test.js | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 991ea92cb..854345f79 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Check out our [wiki]([https://github.com/lodash/lodash/wiki/build-differences]) CDN copies are available on [cdnjs](http://cdnjs.com/libraries/lodash.js/) & [jsDelivr](http://www.jsdelivr.com/#!lodash). For smaller file sizes, create [custom builds](http://lodash.com/custom-builds) with only the features needed. -Love modules? We’ve got you covered with [lodash-amd](https://npmjs.org/package/lodash-amd), [lodash-es6](https://npmjs.org/package/lodash-es6), [lodash-node](https://npmjs.org/package/lodash-node), & [npm packages](https://npmjs.org/browse/keyword/lodash-modularized) per method. +Love modules? We’ve got you covered with [lodash-amd](https://npmjs.org/package/lodash-amd), [lodash-es6](https://github.com/lodash/lodash-es6), [lodash-node](https://npmjs.org/package/lodash-node), & [npm packages](https://npmjs.org/browse/keyword/lodash-modularized) per method. ## Dive in diff --git a/test/asset/test-ui.js b/test/asset/test-ui.js index 7a4ca6e35..ab5b03851 100644 --- a/test/asset/test-ui.js +++ b/test/asset/test-ui.js @@ -34,9 +34,6 @@ /*--------------------------------------------------------------------------*/ - // used to indicate testing a modularized build - ui.isModularize = /\b(?:commonjs|(index|main)\.js|lodash-(?:amd|node)|modularize|npm)\b/.test([location.pathname, location.search, ui.buildPath]); - // initialize controls addListener(window, 'load', function() { function eventHandler(event) { @@ -168,6 +165,9 @@ 'loader': loader }; + // used to indicate testing a modularized build + ui.isModularize = /\b(?:commonjs|(index|main)\.js|lodash-(?:amd|node)|modularize|npm)\b/.test([location.pathname, location.search, ui.buildPath]); + // expose `ui` window.ui = ui; diff --git a/test/test.js b/test/test.js index 73a842cfa..ae34ef654 100644 --- a/test/test.js +++ b/test/test.js @@ -6962,7 +6962,7 @@ var throttled = _.throttle(function(value) { count++; return value; - }, 32, {}); + }, 64, {}); equal(throttled('x'), 'x'); equal(throttled('y'), 'x'); @@ -7003,12 +7003,12 @@ var withTrailing = _.throttle(function(value) { withCount++; return value; - }, 64, { 'trailing': true }); + }, 128, { 'trailing': true }); var withoutTrailing = _.throttle(function(value) { withoutCount++; return value; - }, 64, { 'trailing': false }); + }, 128, { 'trailing': false }); equal(withTrailing('x'), 'x'); equal(withTrailing('y'), 'x'); @@ -7020,7 +7020,7 @@ equal(withCount, 2); strictEqual(withoutCount, 1); QUnit.start(); - }, 256); + }, 512); } else { skipTest(6);