Skip to content

Commit

Permalink
Revert "Randomize pbjs global name when testing" (#1891)
Browse files Browse the repository at this point in the history
* Revert "Postbid bugfix  (#1844)"

This reverts commit 2e7783a.

* Revert "Populate adtypes array (#1862)"

This reverts commit 214ba19.

* Revert "Pass bidderRequestId parameter in Adform adapter (#1888)"

This reverts commit 59800f4.

* Revert "Add Arteebee bidder adapter (#1849)"

This reverts commit 18fe42d.

* Revert "fix linting errors for trailing spaces (#1889)"

This reverts commit d41287a.

* Revert "Randomize pbjs global name when testing (#1787)"

This reverts commit f9cb0dd.
  • Loading branch information
jsnellbaker authored Nov 28, 2017
1 parent 2e7783a commit d302a87
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion karma.conf.maker.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
4 changes: 1 addition & 3 deletions webpack.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -79,7 +77,7 @@ module.exports = {
{
pattern: /\$\$PREBID_GLOBAL\$\$/g,
replacement: function (match, p1, offset, string) {
return prebidGlobalName;
return prebid.globalVarName;
}
}
]
Expand Down

0 comments on commit d302a87

Please sign in to comment.