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.

Sign up for GitHub

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

Revert "Randomize pbjs global name when testing" #1891

Merged
merged 6 commits into from
Nov 28, 2017
+2 −4
Merged

Revert "Randomize pbjs global name when testing" #1891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
518e852
Revert "Postbid bugfix (#1844)"
jsnellbaker Nov 28, 2017
caa65bd
Revert "Populate adtypes array (#1862)"
jsnellbaker Nov 28, 2017
7ae2062
Revert "Pass bidderRequestId parameter in Adform adapter (#1888)"
jsnellbaker Nov 28, 2017
854e6e4
Revert "Add Arteebee bidder adapter (#1849)"
jsnellbaker Nov 28, 2017
826ae63
Revert "fix linting errors for trailing spaces (#1889)"
jsnellbaker Nov 28, 2017
c90e459
Revert "Randomize pbjs global name when testing (#1787)"
jsnellbaker Nov 28, 2017
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 karma.conf.maker.js
View file
Open in desktop
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
View file
Open in desktop
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