Merge pull request #226 from jgonggrijp/update-test

Author: jgonggrijp

CONTRIBUTING.md

@@ -10,28 +10,29 @@ Create your own fork of contrib where you can make your changes.
 
 ## 3. Install development dependencies
 
-Make sure you have [Node.js][node] and the [grunt cli][cli] installed. Then install contrib's development dependencies with `npm install`.
+Make sure you have [Node.js][node] and [Yarn][yarn] installed. Then install contrib's development dependencies with `yarn`. Note that these dependencies include the [Grunt CLI][cli] which we use for task automation.
 
 ## 4. Change the code
 
 Make your code changes, ensuring they adhere to the same [coding style as Underscore][style]. Do **not** edit the files in `dist/`.
 
-Make any necessary updates to the qUnit tests found in `test/`. Run `grunt test` to catch any test failures or lint issues. You can also use `grunt watch:test` to get instant feedback each time you save a file.
+Make any necessary updates to the qUnit tests found in `test/`. Run `yarn test` to catch any test failures or lint issues. You can also use `yarn grunt watch:test` to get instant feedback each time you save a file.
 
 ## 5. Update the docs
 
 Make any necessary documentation updates in `docs/`. Do **not** edit `index.html` directly.
 
-After updating the docs, run `grunt tocdoc` to rebuild the `index.html` file. Visually inspect `index.html` in your browser to ensure the generated docs look nice.
+After updating the docs, run `yarn tocdoc` to rebuild the `index.html` file. Visually inspect `index.html` in your browser to ensure the generated docs look nice.
 
 ## 6. Send a pull request
 
 Send a pull request to `documentcloud/underscore-contrib` for feedback.
 
-If modifications are necessary, make the changes and rerun `grunt test` or `grunt tocdoc` as needed.
+If modifications are necessary, make the changes and rerun `yarn test` or `yarn tocdoc` as needed.
 
 And hopefully your pull request will be merged by the core team! :-)
 
 [style]:https://github.com/documentcloud/underscore/blob/master/underscore.js
 [node]:http://nodejs.org/
-[cli]:http://gruntjs.com/getting-started#installing-the-cli
+[yarn]:https://classic.yarnpkg.com/
+[cli]:http://gruntjs.com/getting-started#installing-the-cli

package.json

@@ -3,19 +3,21 @@
   "version": "0.3.0",
   "main": "index.js",
   "dependencies": {
-    "underscore": "1.7.0"
+    "underscore": "1.10.2"
   },
   "devDependencies": {
-    "grunt": "^1.2.0",
+    "grunt": "^1.3.0",
     "grunt-cli": "^1.3.2",
-    "grunt-contrib-concat": "0.3.0",
+    "grunt-contrib-concat": "1.0.1",
     "grunt-contrib-jshint": "^2.1.0",
     "grunt-contrib-qunit": "^4.0.0",
-    "grunt-contrib-uglify": "^4.0.1",
+    "grunt-contrib-uglify": "^5.0.0",
     "grunt-contrib-watch": "^1.1.0",
-    "grunt-docco": "~0.3.0",
+    "grunt-docco": "~0.5.0",
     "grunt-tocdoc": "0.1.1",
-    "qunit": "^2.10.0"
+    "jquery": "3.5.1",
+    "jslitmus": "^0.1.0",
+    "qunit": "^2.11.0"
   },
   "repository": {
     "type": "git",

test/array.builders.js

@@ -1,105 +1,105 @@
 $(document).ready(function() {
 
-  module("underscore.array.selectors");
+  QUnit.module("underscore.array.selectors");
 
-  test("second", function() {
+  QUnit.test("second", function(assert) {
     var a = [1,2,3,4,5];
 
-    equal(_.second(a), 2, 'should retrieve the 2nd element in an array');
-    deepEqual(_.second(a, 5), [2,3,4,5], 'should retrieve all but the first element in an array');
-    deepEqual(_.map([a,_.rest(a)], _.second), [2,3], 'should be usable in _.map');
+    assert.equal(_.second(a), 2, 'should retrieve the 2nd element in an array');
+    assert.deepEqual(_.second(a, 5), [2,3,4,5], 'should retrieve all but the first element in an array');
+    assert.deepEqual(_.map([a,_.rest(a)], _.second), [2,3], 'should be usable in _.map');
   });
 
-  test("third", function() {
+  QUnit.test("third", function(assert) {
     var a = [1,2,3,4,5];
 
-    equal(_.third(a), 3, 'should retrieve the 3rd element in an array');
-    deepEqual(_.third(a, 5), [3,4,5], 'should retrieve all but the first and second element in an array');
-    deepEqual(_.map([a,_.rest(a)], _.third), [3,4], 'should be usable in _.map');
+    assert.equal(_.third(a), 3, 'should retrieve the 3rd element in an array');
+    assert.deepEqual(_.third(a, 5), [3,4,5], 'should retrieve all but the first and second element in an array');
+    assert.deepEqual(_.map([a,_.rest(a)], _.third), [3,4], 'should be usable in _.map');
   });
 
-  test("takeWhile", function() {
+  QUnit.test("takeWhile", function(assert) {
     var isNeg = function(n) { return n < 0; };
 
-    deepEqual(_.takeWhile([-2,-1,0,1,2], isNeg), [-2,-1], 'should take elements until a function goes truthy');
-    deepEqual(_.takeWhile([1,-2,-1,0,1,2], isNeg), [], 'should take elements until a function goes truthy');
+    assert.deepEqual(_.takeWhile([-2,-1,0,1,2], isNeg), [-2,-1], 'should take elements until a function goes truthy');
+    assert.deepEqual(_.takeWhile([1,-2,-1,0,1,2], isNeg), [], 'should take elements until a function goes truthy');
   });
 
-  test("dropWhile", function() {
+  QUnit.test("dropWhile", function(assert) {
     var isNeg = function(n) { return n < 0; };
 
-    deepEqual(_.dropWhile([-2,-1,0,1,2], isNeg), [0,1,2], 'should drop elements until a function goes truthy');
-    deepEqual(_.dropWhile([0,1,2], isNeg), [0,1,2], 'should drop elements until a function goes truthy');
-    deepEqual(_.dropWhile([-2,-1], isNeg), [], 'should drop elements until a function goes truthy');
-    deepEqual(_.dropWhile([1,-2,-1,0,1,2], isNeg), [1,-2,-1,0,1,2], 'should take elements until a function goes truthy');
-    deepEqual(_.dropWhile([], isNeg), [], 'should handle empty arrays');
+    assert.deepEqual(_.dropWhile([-2,-1,0,1,2], isNeg), [0,1,2], 'should drop elements until a function goes truthy');
+    assert.deepEqual(_.dropWhile([0,1,2], isNeg), [0,1,2], 'should drop elements until a function goes truthy');
+    assert.deepEqual(_.dropWhile([-2,-1], isNeg), [], 'should drop elements until a function goes truthy');
+    assert.deepEqual(_.dropWhile([1,-2,-1,0,1,2], isNeg), [1,-2,-1,0,1,2], 'should take elements until a function goes truthy');
+    assert.deepEqual(_.dropWhile([], isNeg), [], 'should handle empty arrays');
   });
 
-  test("splitWith", function() {
+  QUnit.test("splitWith", function(assert) {
     var a = [1,2,3,4,5];
     var lessEq3p = function(n) { return n <= 3; };
     var lessEq3p$ = function(n) { return (n <= 3) ? true : null; };
 
-    deepEqual(_.splitWith(a, lessEq3p), [[1,2,3], [4,5]], 'should split an array when a function goes false');
-    deepEqual(_.splitWith(a, lessEq3p$), [[1,2,3], [4,5]], 'should split an array when a function goes false');
-    deepEqual(_.splitWith([], lessEq3p$), [[],[]], 'should split an empty array into two empty arrays');
+    assert.deepEqual(_.splitWith(a, lessEq3p), [[1,2,3], [4,5]], 'should split an array when a function goes false');
+    assert.deepEqual(_.splitWith(a, lessEq3p$), [[1,2,3], [4,5]], 'should split an array when a function goes false');
+    assert.deepEqual(_.splitWith([], lessEq3p$), [[],[]], 'should split an empty array into two empty arrays');
   });
 
-  test("partitionBy", function() {
+  QUnit.test("partitionBy", function(assert) {
     var a = [1, 2, null, false, undefined, 3, 4];
 
-    deepEqual(_.partitionBy(a, _.truthy), [[1,2], [null, false, undefined], [3,4]], 'should partition an array as a given predicate changes truth sense');
+    assert.deepEqual(_.partitionBy(a, _.truthy), [[1,2], [null, false, undefined], [3,4]], 'should partition an array as a given predicate changes truth sense');
   });
 
-  test("best", function() {
+  QUnit.test("best", function(assert) {
     var a = [1,2,3,4,5];
 
-    deepEqual(_.best(a, function(x,y) { return x > y; }), 5, 'should identify the best value based on criteria');
+    assert.deepEqual(_.best(a, function(x,y) { return x > y; }), 5, 'should identify the best value based on criteria');
   });
 
-  test("keep", function() {
+  QUnit.test("keep", function(assert) {
     var a = _.range(10);
     var eveny = function(e) { return (_.isEven(e)) ? e : undefined; };
 
-    deepEqual(_.keep(a, eveny), [0,2,4,6,8], 'should keep only even numbers in a range tagged with null fails');
-    deepEqual(_.keep(a, _.isEven), [true, false, true, false, true, false, true, false, true, false], 'should keep all existy values corresponding to a predicate over a range');
+    assert.deepEqual(_.keep(a, eveny), [0,2,4,6,8], 'should keep only even numbers in a range tagged with null fails');
+    assert.deepEqual(_.keep(a, _.isEven), [true, false, true, false, true, false, true, false, true, false], 'should keep all existy values corresponding to a predicate over a range');
   });
 
-  test("nth", function() {
+  QUnit.test("nth", function(assert) {
     var a = ['a','b','c'];
     var b = [['a'],['b'],[]];
 
-    equal(_.nth(a,0), 'a', 'should return the element at a given index into an array');
-    equal(_.nth(a,100), undefined, 'should return undefined if out of bounds');
-    deepEqual(_.map(b,function(e) { return _.nth(e,0); }), ['a','b',undefined], 'should be usable in _.map');
+    assert.equal(_.nth(a,0), 'a', 'should return the element at a given index into an array');
+    assert.equal(_.nth(a,100), undefined, 'should return undefined if out of bounds');
+    assert.deepEqual(_.map(b,function(e) { return _.nth(e,0); }), ['a','b',undefined], 'should be usable in _.map');
   });
 
-  test("nths", function() {
+  QUnit.test("nths", function(assert) {
     var a = ['a','b','c', 'd'];
 
-    deepEqual(_.nths(a,1), ['b'], 'should return the element at a given index into an array');
-    deepEqual(_.nths(a,1,3), ['b', 'd'], 'should return the elements at given indices into an array');
-    deepEqual(_.nths(a,1,5,3), ['b', undefined, 'd'], 'should return undefined if out of bounds');
+    assert.deepEqual(_.nths(a,1), ['b'], 'should return the element at a given index into an array');
+    assert.deepEqual(_.nths(a,1,3), ['b', 'd'], 'should return the elements at given indices into an array');
+    assert.deepEqual(_.nths(a,1,5,3), ['b', undefined, 'd'], 'should return undefined if out of bounds');
 
-    deepEqual(_.nths(a,[1]), ['b'], 'should return the element at a given index into an array');
-    deepEqual(_.nths(a,[1,3]), ['b', 'd'], 'should return the elements at given indices into an array');
-    deepEqual(_.nths(a,[1,5,3]), ['b', undefined, 'd'], 'should return undefined if out of bounds');
+    assert.deepEqual(_.nths(a,[1]), ['b'], 'should return the element at a given index into an array');
+    assert.deepEqual(_.nths(a,[1,3]), ['b', 'd'], 'should return the elements at given indices into an array');
+    assert.deepEqual(_.nths(a,[1,5,3]), ['b', undefined, 'd'], 'should return undefined if out of bounds');
   });
 
-  test("valuesAt", function() {
-    equal(_.valuesAt, _.nths, 'valuesAt should be alias for nths');
+  QUnit.test("valuesAt", function(assert) {
+    assert.equal(_.valuesAt, _.nths, 'valuesAt should be alias for nths');
   });
 
-  test("binPick", function() {
+  QUnit.test("binPick", function(assert) {
     var a = ['a','b','c', 'd'];
 
-    deepEqual(_.binPick(a, false, true), ['b'], 'should return the element at a given index into an array');
-    deepEqual(_.binPick(a, false, true, false, true), ['b', 'd'], 'should return the elements at given indices into an array');
-    deepEqual(_.binPick(a, false, true, false, true, true), ['b', 'd', undefined], 'should return undefined if out of bounds');
+    assert.deepEqual(_.binPick(a, false, true), ['b'], 'should return the element at a given index into an array');
+    assert.deepEqual(_.binPick(a, false, true, false, true), ['b', 'd'], 'should return the elements at given indices into an array');
+    assert.deepEqual(_.binPick(a, false, true, false, true, true), ['b', 'd', undefined], 'should return undefined if out of bounds');
 
-    deepEqual(_.binPick(a, [false, true]), ['b'], 'should return the element at a given index into an array');
-    deepEqual(_.binPick(a, [false, true, false, true]), ['b', 'd'], 'should return the elements at given indices into an array');
-    deepEqual(_.binPick(a, [false, true, false, true, true]), ['b', 'd', undefined], 'should return undefined if out of bounds');
+    assert.deepEqual(_.binPick(a, [false, true]), ['b'], 'should return the element at a given index into an array');
+    assert.deepEqual(_.binPick(a, [false, true, false, true]), ['b', 'd'], 'should return the elements at given indices into an array');
+    assert.deepEqual(_.binPick(a, [false, true, false, true, true]), ['b', 'd', undefined], 'should return undefined if out of bounds');
   });
 });