From 518e8524f130cd25ed8b93a8f126a4f89471e06b Mon Sep 17 00:00:00 2001 From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:57:23 -0500 Subject: [PATCH 1/6] Revert "Postbid bugfix (#1844)" This reverts commit 2e7783a4de94c3f056eced437c4d8b0101673271. From caa65bdaba7e5c3e66d722af8b332bc090a72e8c Mon Sep 17 00:00:00 2001 From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:57:23 -0500 Subject: [PATCH 2/6] Revert "Populate adtypes array (#1862)" This reverts commit 214ba1903e9669a159f50f68c07ee7335fcf5a23. From 7ae20621a2b0ea9fb2d7c2b7075f2f10d73c32f4 Mon Sep 17 00:00:00 2001 From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:57:23 -0500 Subject: [PATCH 3/6] Revert "Pass bidderRequestId parameter in Adform adapter (#1888)" This reverts commit 59800f4258bc2423723ea75ea22f0338635b11a7. From 854e6e4c087385e67594a7f1059fd6dbb70fcaee Mon Sep 17 00:00:00 2001 From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:57:23 -0500 Subject: [PATCH 4/6] Revert "Add Arteebee bidder adapter (#1849)" This reverts commit 18fe42d867fa1e96bcbddb7fa1259dc5e18f903f. From 826ae63926a316c0240f5772660677db8a46bd6f Mon Sep 17 00:00:00 2001 From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:57:23 -0500 Subject: [PATCH 5/6] Revert "fix linting errors for trailing spaces (#1889)" This reverts commit d41287abe5bf2f6c5d83f113956f8a68db3bb9ab. From c90e459b860dbb958a50345709af7f698a2819fa Mon Sep 17 00:00:00 2001 From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:57:23 -0500 Subject: [PATCH 6/6] Revert "Randomize pbjs global name when testing (#1787)" This reverts commit f9cb0dd5b328f7e87ce39f49816dea3d38674a02. --- karma.conf.maker.js | 2 +- webpack.conf.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/karma.conf.maker.js b/karma.conf.maker.js index 98148e565d3..d2b1d49e081 100644 --- a/karma.conf.maker.js +++ b/karma.conf.maker.js @@ -1,7 +1,7 @@ // This configures Karma, describing how to run the tests and where to output code coverage reports. // // For more information, see http://karma-runner.github.io/1.0/config/configuration-file.html -process.env.test = true; + var _ = require('lodash'); var webpackConf = require('./webpack.conf'); var path = require('path') diff --git a/webpack.conf.js b/webpack.conf.js index 9f42fe46701..38f4e5dadd7 100644 --- a/webpack.conf.js +++ b/webpack.conf.js @@ -10,8 +10,6 @@ var neverBundle = [ 'AnalyticsAdapter.js' ]; -var prebidGlobalName = process.env.test ? 'pbjs_' + Math.floor(Math.random() * 10000) : prebid.globalVarName; - module.exports = { devtool: 'source-map', resolve: { @@ -79,7 +77,7 @@ module.exports = { { pattern: /\$\$PREBID_GLOBAL\$\$/g, replacement: function (match, p1, offset, string) { - return prebidGlobalName; + return prebid.globalVarName; } } ]