Fixing issue #4950

.eslintrc.js

@@ -39,6 +39,7 @@ module.exports = {
     "no-throw-literal": "off",
     "no-undef": 2,
     "no-useless-escape": "off",
+    "no-console": "error"
   },
   "overrides": Object.keys(allowedModules).map((key) => ({
     "files": key + "/**/*.js",

CONTRIBUTING.md

@@ -51,6 +51,7 @@ When you are adding code to Prebid.js, or modifying code that isn't covered by a
 - If you need to check `adloader.loadExternalScript` in a test, use a `stub` rather than a `spy`. `spy`s trigger a network call which can result in a `script error` and cause unrelated unit tests to fail. `stub`s will let you gather information about the `adloader.loadExternalScript` call without affecting external resources
 - If your test makes ajax requests, use the global xhr stub in `test/mocks/xhr`. Do not use your own `sinon.useFakeXMLHttpRequest()` or `sinon.createFakeServer()`.
 - When writing tests you may use ES2015 syntax if desired
+- If your test relies on `Window` or `global` object, do not mutate that object directly. Instead, create a separate copy of that object and perform operations on that new copy.
 
 ### Test Examples
 Prebid.js already has many tests. Read them to see how Prebid.js is tested, and for inspiration:

allowedModules.js

@@ -13,7 +13,8 @@ module.exports = {
     ...sharedWhiteList,
     'criteo-direct-rsa-validate',
     'jsencrypt',
-    'crypto-js'
+    'crypto-js',
+    'live-connect' // Maintained by LiveIntent : https://github.com/liveintent-berlin/live-connect/
   ],
   'src': [
     ...sharedWhiteList,

browsers.json

@@ -7,11 +7,11 @@
     "device": null,
     "os": "Windows"
   },
-  "bs_edge_16_windows_10": {
+  "bs_edge_18_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "edge",
-    "browser_version": "16.0",
+    "browser_version": "18.0",
     "device": null,
     "os": "Windows"
   },
@@ -23,43 +23,43 @@
     "device": null,
     "os": "Windows"
   },
-  "bs_chrome_74_windows_10": {
+  "bs_chrome_80_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "chrome",
-    "browser_version": "74.0",
+    "browser_version": "80.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_chrome_75_windows_10": {
+  "bs_chrome_79_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "chrome",
-    "browser_version": "75.0",
+    "browser_version": "79.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_firefox_66_windows_10": {
+  "bs_firefox_73_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "firefox",
-    "browser_version": "66.0",
+    "browser_version": "73.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_firefox_67_windows_10": {
+  "bs_firefox_72_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "firefox",
-    "browser_version": "67.0",
+    "browser_version": "72.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_safari_11_mac_high_sierra": {
+  "bs_safari_11_mac_catalina": {
     "base": "BrowserStack",
-    "os_version": "High Sierra",
+    "os_version": "Catalina",
     "browser": "safari",
-    "browser_version": "11.1",
+    "browser_version": "13.0",
     "device": null,
     "os": "OS X"
   },

gulpfile.js

@@ -67,11 +67,11 @@ function lint(done) {
   if (argv.nolint) {
     return done();
   }
-  const isFixed = function(file) {
+  const isFixed = function (file) {
     return file.eslint != null && file.eslint.fixed;
   }
-  return gulp.src(['src/**/*.js', 'modules/**/*.js', 'test/**/*.js'], {base: './'})
-    .pipe(gulpif(argv.nolintfix, eslint(), eslint({fix: true})))
+  return gulp.src(['src/**/*.js', 'modules/**/*.js', 'test/**/*.js'], { base: './' })
+    .pipe(gulpif(argv.nolintfix, eslint(), eslint({ fix: true })))
     .pipe(eslint.format('stylish'))
     .pipe(eslint.failAfterError())
     .pipe(gulpif(isFixed, gulp.dest('./')));
@@ -84,7 +84,7 @@ function viewCoverage(done) {
 
   connect.server({
     port: coveragePort,
-    root: 'build/coverage/karma_html',
+    root: 'build/coverage/lcov-report',
     livereload: false
   });
   opens('http://' + mylocalhost + ':' + coveragePort);
@@ -160,7 +160,7 @@ function nodeBundle(modules) {
       .on('error', (err) => {
         reject(err);
       })
-      .pipe(through.obj(function(file, enc, done) {
+      .pipe(through.obj(function (file, enc, done) {
         resolve(file.contents.toString(enc));
         done();
       }));
@@ -199,7 +199,7 @@ function bundle(dev, moduleArr) {
   return gulp.src(
     entries
   )
-    .pipe(gulpif(dev, sourcemaps.init({loadMaps: true})))
+    .pipe(gulpif(dev, sourcemaps.init({ loadMaps: true })))
     .pipe(concat(outputFileName))
     .pipe(gulpif(!argv.manualEnable, footer('\n<%= global %>.processQueue();', {
       global: prebid.globalVarName
@@ -239,7 +239,7 @@ function test(done) {
     }
 
     //run mock-server
-    const mockServer = spawn('node', ['./test/mock-server/index.js', '--port='+mockServerPort]);
+    const mockServer = spawn('node', ['./test/mock-server/index.js', '--port=' + mockServerPort]);
     mockServer.stdout.on('data', (data) => {
       console.log(`stdout: ${data}`);
     });
@@ -273,7 +273,7 @@ function test(done) {
 }
 
 function newKarmaCallback(done) {
-  return function(exitCode) {
+  return function (exitCode) {
     if (exitCode) {
       done(new Error('Karma tests failed with exit code ' + exitCode));
       if (argv.browserstack) {
@@ -296,7 +296,7 @@ function testCoverage(done) {
 function coveralls() { // 2nd arg is a dependency: 'test' must be finished
   // first send results of istanbul's test coverage to coveralls.io.
   return gulp.src('gulpfile.js', { read: false }) // You have to give it a file, but you don't
-  // have to read it.
+    // have to read it.
     .pipe(shell('cat build/coverage/lcov.info | node_modules/coveralls/bin/coveralls.js'));
 }
 
@@ -326,10 +326,10 @@ function setupE2e(done) {
   done();
 }
 
-gulp.task('updatepath', function(){
+gulp.task('updatepath', function () {
   return gulp.src(['build/dist/*.js'])
-  .pipe(replace('https://ib.adnxs.com/ut/v3/prebid', 'http://' + host + ':' + mockServerPort + '/'))
-  .pipe(gulp.dest('build/dist'));
+    .pipe(replace('https://ib.adnxs.com/ut/v3/prebid', 'http://' + host + ':' + mockServerPort + '/'))
+    .pipe(gulp.dest('build/dist'));
 });
 
 // support tasks

integrationExamples/gpt/responsiveAds_sizeMappingV2.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<script async src="../../../build/dev/prebid.js"></script>
+	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+	<script>
+		const FAILSAFE_TIMEOUT = 3300;
+		const PREBID_TIMEOUT = 1000;
+
+		const adUnits = [{
+			code: 'div-gpt-ad-1460505748561-0',
+			mediaTypes: {
+				banner: {
+					sizeConfig: [
+						{ minViewPort: [0, 0], sizes: [] },		// remove if < 750px
+						{ minViewPort: [750, 0], sizes: [[300, 250], [300, 600]] },		// between 750px and 1199px
+						{ minViewPort: [1200, 0], sizes: [[970, 90], [728, 90], [300, 250]] },  // between 1200px and 1599px
+						{ minViewPort: [1600, 0], sizes: [[1000, 300], [970, 90], [728, 90], [300, 250]] } // greater than 1600px
+					]
+				},
+				video: {
+					context: 'instream',
+					sizeConfig: [
+						{ minViewPort: [0, 0], playerSize: [] },
+						{ minViewPort: [800, 0], playerSize: [640, 480] }
+					]
+				},
+				native: {
+					image: {
+						required: true,
+						sizes: [150, 50]
+					},
+
+					sizeConfig: [
+						{ minViewPort: [0, 0], active: false },
+						{ minViewPort: [600, 0], active: true }
+					]
+				}
+			},
+			bids: [{
+				bidder: 'appnexus',
+				params: {
+					placementId: 13144370
+				},
+				sizeConfig: [
+					{ minViewPort: [0, 0], relevantMediaTypes: ['none'] },
+					{ minViewPort: [850, 0], relevantMediaTypes: ['banner'] }
+				]
+			}, {
+				bidder: 'rubicon',
+				params: {
+					accountId: 14062,
+					siteId: 70608,
+					zoneId: 498816
+				},
+				sizeConfig: [
+					{ minViewPort: [0, 0], relevantMediaTypes: ['none'] },
+					{ minViewPort: [850, 0], relevantMediaTypes: ['native'] },
+					{ minViewPort: [1200, 0], relevantMediaTypes: ['none'] }
+				]
+			}]
+		}];
+		var pbjs = pbjs || {};
+		pbjs.que = pbjs.que || [];
+
+	</script>
+
+	<script>
+		var googletag = googletag || {};
+		googletag.cmd = googletag.cmd || [];
+		googletag.cmd.push(function () {
+			googletag.pubads().disableInitialLoad();
+		});
+
+		pbjs.que.push(function () {
+			pbjs.addAdUnits(adUnits);
+			pbjs.requestBids({
+				bidsBackHandler: sendAdserverRequest,
+				timeout: PREBID_TIMEOUT
+			});
+		});
+
+		function sendAdserverRequest() {
+			if (pbjs.adserverRequestSent) return;
+			pbjs.adserverRequestSent = true;
+			googletag.cmd.push(function () {
+				pbjs.que.push(function () {
+					pbjs.setTargetingForGPTAsync();
+					googletag.pubads().refresh();
+				});
+			});
+		}
+
+		setTimeout(function () {
+			sendAdserverRequest();
+		}, FAILSAFE_TIMEOUT);
+
+	</script>
+
+	<script>
+		googletag.cmd.push(function () {
+			googletag.defineSlot('/19968336/header-bid-tag-0', [728, 90], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
+
+			googletag.pubads().enableSingleRequest();
+			googletag.enableServices();
+		});
+	</script>
+</head>
+
+<body>
+	<h2>Prebid.js Test</h2>
+	<h5>Div-1</h5>
+	<div id='div-gpt-ad-1460505748561-0'>
+		<script type='text/javascript'>
+			googletag.cmd.push(function () { googletag.display('div-gpt-ad-1460505748561-0'); });
+		</script>
+	</div>
+</body>
+
+</html>

karma.conf.maker.js

@@ -4,7 +4,6 @@
 
 var _ = require('lodash');
 var webpackConf = require('./webpack.conf');
-var path = require('path')
 var karmaConstants = require('karma').constants;
 
 function newWebpackConfig(codeCoverage) {
@@ -33,7 +32,7 @@ function newWebpackConfig(codeCoverage) {
 function newPluginsArray(browserstack) {
   var plugins = [
     'karma-chrome-launcher',
-    'karma-coverage-istanbul-reporter',
+    'karma-coverage',
     'karma-es5-shim',
     'karma-mocha',
     'karma-chai',
@@ -66,18 +65,15 @@ function setReporters(karmaConf, codeCoverage, browserstack) {
       suppressPassed: true
     };
   }
+
   if (codeCoverage) {
-    karmaConf.reporters.push('coverage-istanbul');
-    karmaConf.coverageIstanbulReporter = {
-      reports: ['html', 'lcovonly', 'text-summary'],
-      dir: path.join(__dirname, 'build', 'coverage'),
-      'report-config': {
-        html: {
-          subdir: 'karma_html',
-          urlFriendlyName: true, // simply replaces spaces with _ for files/dirs
-        }
-      }
-    }
+    karmaConf.reporters.push('coverage');
+    karmaConf.coverageReporter = {
+      dir: 'build/coverage',
+      reporters: [
+        { type: 'lcov', subdir: '.' }
+      ]
+    };
   }
 }
 
@@ -92,7 +88,7 @@ function setBrowsers(karmaConf, browserstack) {
       karmaConf.browserStack.startTunnel = false;
       karmaConf.browserStack.tunnelIdentifier = process.env.BROWSERSTACK_LOCAL_IDENTIFIER;
     }
-    karmaConf.customLaunchers = require('./browsers.json')
+    karmaConf.customLaunchers = require('./browsers.json');
     karmaConf.browsers = Object.keys(karmaConf.customLaunchers);
   } else {
     var isDocker = require('is-docker')();
@@ -157,6 +153,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {
     autoWatch: true,
 
     reporters: ['mocha'],
+
     mochaReporter: {
       showDiff: true,
       output: 'minimal'
@@ -165,10 +162,11 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
     singleRun: !watchMode,
-    browserDisconnectTimeout: 10000, // default 2000
-    browserDisconnectTolerance: 1, // default 0
-    browserNoActivityTimeout: 4 * 60 * 1000, // default 10000
-    captureTimeout: 4 * 60 * 1000, // default 60000
+    browserDisconnectTimeout: 3e5, // default 2000
+    browserNoActivityTimeout: 3e5, // default 10000
+    captureTimeout: 3e5, // default 60000,
+    browserDisconnectTolerance: 3,
+    concurrency: 5,
 
     plugins: plugins
   }