From 78a75adcd2378df10a6ff3930f2eeea5be0b451d Mon Sep 17 00:00:00 2001 From: Deeky Polusani Date: Mon, 17 Dec 2018 16:16:38 -0500 Subject: [PATCH 1/3] RAD-2356 Upgrade Mocha karma-webpack karma --- karma.conf.maker.js | 1 - package.json | 8 ++++---- test/spec/videoCache_spec.js | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/karma.conf.maker.js b/karma.conf.maker.js index 7faf91f0847..8c9b3454639 100644 --- a/karma.conf.maker.js +++ b/karma.conf.maker.js @@ -34,7 +34,6 @@ function newPluginsArray(browserstack) { 'karma-es5-shim', 'karma-mocha', 'karma-chai', - 'karma-requirejs', 'karma-sinon', 'karma-sourcemap-loader', 'karma-spec-reporter', diff --git a/package.json b/package.json index 2445032536c..90a8bfa1c14 100755 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "gulp-babel": "^6.1.2", "gulp-clean": "^0.3.2", "gulp-concat": "^2.6.0", - "gulp-webserver": "^0.9.1", "gulp-coveralls": "^0.1.4", "gulp-eslint": "^4.0.0", "gulp-footer": "github:prebid/gulp-footer#master", @@ -58,12 +57,13 @@ "gulp-shell": "^0.5.2", "gulp-uglify": "^3.0.0", "gulp-util": "^3.0.0", + "gulp-webserver": "^0.9.1", "ignore-loader": "^0.1.2", "is-docker": "^1.1.0", "istanbul": "^0.4.5", "istanbul-instrumenter-loader": "^3.0.0", "json-loader": "^0.5.1", - "karma": "^2.0.0", + "karma": "^3.1.3", "karma-babel-preprocessor": "^6.0.1", "karma-browserstack-launcher": "^1.0.1", "karma-chai": "^0.1.0", @@ -81,11 +81,11 @@ "karma-sinon": "^1.0.5", "karma-sourcemap-loader": "^0.3.7", "karma-spec-reporter": "^0.0.31", - "karma-webpack": "^2.0.3", + "karma-webpack": "^3.0.5", "localtunnel": "^1.3.0", "lodash": "^4.17.4", "mkpath": "^1.0.0", - "mocha": "2.2.5", + "mocha": "^5.0.0", "mock-fs": "^3.11.0", "nightwatch": "^1.0.6", "open": "0.0.5", diff --git a/test/spec/videoCache_spec.js b/test/spec/videoCache_spec.js index b9c2d445646..163cb326740 100644 --- a/test/spec/videoCache_spec.js +++ b/test/spec/videoCache_spec.js @@ -1,4 +1,4 @@ -import 'mocha'; +import 'mocha/mocha'; import chai from 'chai'; import { getCacheUrl, store } from 'src/videoCache'; import { config } from 'src/config'; From 55d5dc30c7e5095efc06ca4d1ffe4450699d3bff Mon Sep 17 00:00:00 2001 From: Deeky Polusani Date: Tue, 18 Dec 2018 11:40:26 -0500 Subject: [PATCH 2/3] RAD-2356 update readme to support node v6 or more --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b81d19a574c..11d0f2d50e3 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Working examples can be found in [the developer docs](http://prebid.org/dev-docs $ cd Prebid.js $ npm install -*Note:* You need to have `NodeJS` 4.x or greater installed. +*Note:* You need to have `NodeJS` 6.x or greater installed. *Note:* In the 1.24.0 release of Prebid.js we have transitioned to using gulp 4.0 from using gulp 3.9.1. To compily with gulp's recommended setup for 4.0, you'll need to have `gulp-cli` installed globally prior to running the general `npm install`. This shouldn't impact any other projects you may work on that use an earlier version of gulp in it's setup. From 9f8a0822505d20ed80150455f8345978e26599fe Mon Sep 17 00:00:00 2001 From: Deeky Polusani Date: Tue, 18 Dec 2018 13:51:35 -0500 Subject: [PATCH 3/3] Remove webpack output logs while testing --- karma.conf.maker.js | 1 + 1 file changed, 1 insertion(+) diff --git a/karma.conf.maker.js b/karma.conf.maker.js index 8c9b3454639..6073ee2585a 100644 --- a/karma.conf.maker.js +++ b/karma.conf.maker.js @@ -124,6 +124,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) { webpack: webpackConfig, webpackMiddleware: { + stats: 'errors-only', noInfo: true }, // frameworks to use