Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rad 2356 upgrade mocha #3392

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion karma.conf.maker.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ function newPluginsArray(browserstack) {
'karma-es5-shim',
'karma-mocha',
'karma-chai',
'karma-requirejs',
'karma-sinon',
'karma-sourcemap-loader',
'karma-spec-reporter',
Expand Down Expand Up @@ -125,6 +124,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {

webpack: webpackConfig,
webpackMiddleware: {
stats: 'errors-only',
noInfo: true
},
// frameworks to use
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/spec/videoCache_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'mocha';
import 'mocha/mocha';
import chai from 'chai';
import { getCacheUrl, store } from 'src/videoCache';
import { config } from 'src/config';
Expand Down