Merge pull request #596 from gemini-testing/lodash-4.x

Update lodash to 4.x.x
gemini-testing · Sep 15, 2016 · c970c52 · c970c52
2 parents 63221aa + 221e1ff
commit c970c52
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 15 deletions.
diff --git a/lib/browser-pool/per-browser-limited-pool.js b/lib/browser-pool/per-browser-limited-pool.js
@@ -28,6 +28,6 @@ module.exports = class PerBrowserLimitedPool extends Pool {
 
     cancel() {
         log('cancel');
-        _.each(this._browserPools, (pool) => pool.cancel());
+        _.forEach(this._browserPools, (pool) => pool.cancel());
     }
 };
diff --git a/lib/cli/deprecations.js b/lib/cli/deprecations.js
@@ -28,8 +28,8 @@ exports.checkForDeprecations = function() {
 };
 
 function checkForRemovedOptions() {
-    _.each(REMOVED_OPTIONS_REPLACEMENTS, function(replacement, option) {
-        if (_.contains(process.argv, option)) {
+    _.forEach(REMOVED_OPTIONS_REPLACEMENTS, function(replacement, option) {
+        if (_.includes(process.argv, option)) {
             throw new GeminiError(
                 util.format('Option %s is removed', option),
                 'Instead use ' + replacement
@@ -39,7 +39,7 @@ function checkForRemovedOptions() {
 }
 
 function checkForRemovedEnvVars() {
-    _.each(REMOVED_ENV_REPLACEMENTS, function(replacement, option) {
+    _.forEach(REMOVED_ENV_REPLACEMENTS, function(replacement, option) {
         if (option in process.env) {
             console.warn(
                 'WARNING: %s env var is not longer used. Use %s instead',

diff --git a/lib/coverage.js b/lib/coverage.js
@@ -26,7 +26,7 @@ module.exports = inherit({
     },
 
     addStatsForBrowser: function(stats, browserId) {
-        _.each(stats, function(coverage, url) {
+        _.forEach(stats, function(coverage, url) {
             if (coverage.ignored) {
                 this._warnInnacurate(url, coverage.message);
                 return;
@@ -35,7 +35,7 @@ module.exports = inherit({
                 sourceFile: this._urlToFilePath(url, browserId),
                 coverage: {}
             };
-            _.assign(this.byURL[url].coverage, coverage, coverageLevel.merge);
+            _.assignWith(this.byURL[url].coverage, coverage, coverageLevel.merge);
         }.bind(this));
     },
 
@@ -135,7 +135,7 @@ module.exports = inherit({
         }
 
         var base64Prefix = 'data:application/json;base64,';
-        if (_.contains(sourceMapUrl, base64Prefix)) {
+        if (_.includes(sourceMapUrl, base64Prefix)) {
             var base64Str = sourceMapUrl.split(base64Prefix)[1],
                 sourceMapStr = new Buffer(base64Str, 'base64').toString('utf8');
             return new SourceMapConsumer(JSON.parse(sourceMapStr));

diff --git a/lib/plugins.js b/lib/plugins.js
@@ -5,7 +5,7 @@ var prefix = 'gemini-';
 module.exports = {
     load: function(gemini, options) {
         _.chain(options.system.plugins)
-          .pairs()
+          .toPairs()
           .map(function(pair) {
               return {name: pair[0], opts: pair[1]};
           })

diff --git a/lib/reporters/html/lib.js b/lib/reporters/html/lib.js
@@ -33,7 +33,7 @@ module.exports = {
     currentPath: currentPath,
     diffPath: diffPath,
 
-    referenceAbsolutePath: _.compose(absolutePath, referencePath),
-    currentAbsolutePath: _.compose(absolutePath, currentPath),
-    diffAbsolutePath: _.compose(absolutePath, diffPath)
+    referenceAbsolutePath: _.flowRight(absolutePath, referencePath),
+    currentAbsolutePath: _.flowRight(absolutePath, currentPath),
+    diffAbsolutePath: _.flowRight(absolutePath, diffPath)
 };
diff --git a/lib/runner/browser-runner/index.js b/lib/runner/browser-runner/index.js
@@ -48,7 +48,7 @@ var BrowserRunner = inherit(Runner, {
 
         return _(suites)
             .filter(function(suite) {
-                return _.contains(suite.browsers, _this._browserId);
+                return _.includes(suite.browsers, _this._browserId);
             })
             .map(function(suite) {
                 return _this._tryToRunSuite(suite, stateProcessor);

diff --git a/lib/runner/state-runner/index.js b/lib/runner/state-runner/index.js
@@ -5,7 +5,7 @@ const DisabledStateRunner = require('./disabled-state-runner');
 const _ = require('lodash');
 
 exports.create = (state, browserSession, config) => {
-    if (!_.contains(state.browsers, browserSession.browser.id)) {
+    if (!_.includes(state.browsers, browserSession.browser.id)) {
         return new DisabledStateRunner(state, browserSession, config);
     }
 

diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "inherit": "~2.2.1",
     "install": "^0.6.1",
     "js-yaml": "^3.2.5",
-    "lodash": "^3.10.1",
+    "lodash": "^4.15.0",
     "looks-same": "^3.0.0",
     "minimatch": "^3.0.0",
     "png-img": "^2.1.0",

diff --git a/test/unit/coverage.js b/test/unit/coverage.js
@@ -36,5 +36,17 @@ describe('coverage', () => {
 
             assert.calledWith(path.resolve, 'source/root', 'rel/path');
         });
+
+        it('should correctly merge a coverage level', () => {
+            const config = createConfig();
+            const coverage = new Coverage(config);
+
+            coverage.byURL['http://some/url'] = {
+                coverage: {'.some-selector': 'full'}
+            };
+            coverage.addStatsForBrowser({'http://some/url': {'.some-selector': 'none'}});
+
+            assert.deepEqual(coverage.byURL['http://some/url'].coverage, {'.some-selector': 'full'});
+        });
     });
 });
diff --git a/test/unit/reporters/flat-factory/flat.js b/test/unit/reporters/flat-factory/flat.js
@@ -20,7 +20,7 @@ describe('Reporter#Flat', () => {
 
         return _(chunks)
             .map((val) => val.toLowerCase().split(/:\s/))
-            .zipObject()
+            .fromPairs()
             .value();
     };