themaven-net · bradchoate · Dec 31, 2019 · Oct 29, 2019 · Oct 29, 2019 · Oct 29, 2019
diff --git a/gulpfile.js b/gulpfile.js
@@ -32,6 +32,9 @@ var prebid = require('./package.json');
 var dateString = 'Updated : ' + (new Date()).toISOString().substring(0, 10);
 var banner = '/* <%= prebid.name %> v<%= prebid.version %>\n' + dateString + ' */\n';
 var port = 9999;
+const mockServerPort = 4444;
+const host = argv.host ? argv.host : 'localhost';
+const { spawn } = require('child_process');
 
 // these modules must be explicitly listed in --modules to be included in the build, won't be part of "all" modules
 var explicitModules = [
@@ -234,12 +237,26 @@ function test(done) {
         wdioConf
       ];
     }
+
+    //run mock-server
+    const mockServer = spawn('node', ['./test/mock-server/index.js', '--port='+mockServerPort]);
+    mockServer.stdout.on('data', (data) => {
+      console.log(`stdout: ${data}`);
+    });
+    mockServer.stderr.on('data', (data) => {
+      console.log(`stderr: ${data}`);
+    });
+
     execa(wdioCmd, wdioOpts, { stdio: 'inherit' })
       .then(stdout => {
+        //kill mock server
+        mockServer.kill('SIGINT');
         done();
         process.exit(0);
       })
       .catch(err => {
+        //kill mock server
+        mockServer.kill('SIGINT');
         done(new Error(`Tests failed with error: ${err}`));
         process.exit(1);
       });
@@ -309,6 +326,12 @@ function setupE2e(done) {
   done();
 }
 
+gulp.task('updatepath', function(){
+  return gulp.src(['build/dist/*.js'])
+  .pipe(replace('ib.adnxs.com/ut/v3/prebid', host + ':' + mockServerPort + '/'))
+  .pipe(gulp.dest('build/dist'));
+});
+
 // support tasks
 gulp.task(lint);
 gulp.task(watch);
@@ -334,7 +357,7 @@ gulp.task('build-postbid', gulp.series(escapePostbidConfig, buildPostbid));
 gulp.task('serve', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, test)));
 gulp.task('default', gulp.series(clean, makeWebpackPkg));
 
-gulp.task('e2e-test', gulp.series(clean, setupE2e, gulp.parallel('build-bundle-prod', watch), test))
+gulp.task('e2e-test', gulp.series(clean, setupE2e, gulp.parallel('build-bundle-prod', watch), 'updatepath', test));
 // other tasks
 gulp.task(bundleToStdout);
 gulp.task('bundle', gulpBundle.bind(null, false)); // used for just concatenating pre-built files with no build step

diff --git a/hpmodules.json b/hpmodules.json
@@ -2,6 +2,8 @@
   "33acrossBidAdapter",
   "aolBidAdapter",
   "appnexusBidAdapter",
+  "consentManagement",
+  "consentManagementUsp",
   "emx_digitalBidAdapter",
   "audienceNetworkBidAdapter",
   "ixBidAdapter",

diff --git a/integrationExamples/gpt/hello_world.html b/integrationExamples/gpt/hello_world.html
@@ -8,84 +8,84 @@
 -->
 
 <html>
-  <head>
-      <script async src="../../build/dev/prebid.js"></script>
-      <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
-      <script>
+<head>
+    <script async src="../../build/dev/prebid.js"></script>
+    <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+    <script>
         var FAILSAFE_TIMEOUT = 3300;
         var PREBID_TIMEOUT = 1000;
-  
+
         var adUnits = [{
-          code: 'div-gpt-ad-1460505748561-0',
-          mediaTypes: {
-            banner: {
-              sizes: [[300, 250], [300,600]],
-            }
-          },
-          // Replace this object to test a new Adapter!
-          bids: [{
-            bidder: 'appnexus',
-            params: {
-              placementId: 13144370
-            }
-          }]
-  
+            code: 'div-gpt-ad-1460505748561-0',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250], [300,600]],
+                }
+            },
+            // Replace this object to test a new Adapter!
+            bids: [{
+                bidder: 'appnexus',
+                params: {
+                    placementId: 13144370
+                }
+            }]
+
         }];
-  
+
         var pbjs = pbjs || {};
         pbjs.que = pbjs.que || [];
-  
-      </script>
-  
-      <script>
+
+    </script>
+
+    <script>
         var googletag = googletag || {};
         googletag.cmd = googletag.cmd || [];
         googletag.cmd.push(function() {
-          googletag.pubads().disableInitialLoad();
+            googletag.pubads().disableInitialLoad();
         });
-  
+
         pbjs.que.push(function() {
-          pbjs.addAdUnits(adUnits);
-          pbjs.requestBids({
-            bidsBackHandler: sendAdserverRequest,
-            timeout: PREBID_TIMEOUT
-          });
+            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();
+            if (pbjs.adserverRequestSent) return;
+            pbjs.adserverRequestSent = true;
+            googletag.cmd.push(function() {
+                pbjs.que.push(function() {
+                    pbjs.setTargetingForGPTAsync();
+                    googletag.pubads().refresh();
+                });
             });
-          });
         }
-  
+
         setTimeout(function() {
-          sendAdserverRequest();
+            sendAdserverRequest();
         }, FAILSAFE_TIMEOUT);
-  
-      </script>
-  
-      <script>
+
+    </script>
+
+    <script>
         googletag.cmd.push(function () {
-          googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
-  
-          googletag.pubads().enableSingleRequest();
-          googletag.enableServices();
+            googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], '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'>
+    </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>
+    </script>
+</div>
+</body>
+</html>
diff --git a/integrationExamples/gpt/proxistore_example.html b/integrationExamples/gpt/proxistore_example.html
@@ -0,0 +1,118 @@
+<html>
+
+<head>
+    <script async src="../../build/dev/prebid.js"></script>
+    <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+    <script>
+        var FAILSAFE_TIMEOUT = 3300;
+        var PREBID_TIMEOUT = 1000;
+
+        var adUnits = [
+            {
+                code: 'div-test-half-page',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300, 600]]
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'proxistore',
+                        params: {
+                            website: 'example.com',
+                            language: 'fr'
+                        }
+                    }]
+            },
+            {
+                code: 'rectangle',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300, 250]]
+                    }
+                },
+                bids: [{
+                    bidder: 'proxistore',
+                    params: {
+                        website: 'example.com',
+                        language: 'fr'
+                    }
+                }]
+            },
+            {
+                code: 'leaderboard',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[970, 250]]
+                    }
+                },
+                bids: [{
+                    bidder: 'proxistore',
+                    params: {
+                        website: 'example.com',
+                        language: 'fr'
+                    }
+                }]
+            }
+        ];
+
+        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', [[300, 250], [300, 600]], 'div-test-half-page').addService(googletag.pubads());
+
+            googletag.pubads().enableSingleRequest();
+            googletag.enableServices();
+        });
+    </script>
+</head>
+
+<body>
+    <h2>Prebid.js Test</h2>
+
+    <h5>Div-1</h5>
+
+    <div id='div-test-half-page'>
+        <script type='text/javascript'>
+            googletag.cmd.push(function () { googletag.display('div-test-half-page'); });
+        </script>
+    </div>
+</body>
+
+</html>
diff --git a/modules.json b/modules.json
@@ -4,6 +4,7 @@
   "aolBidAdapter",
   "appnexusBidAdapter",
   "consentManagement",
+  "consentManagementUsp",
   "consumableBidAdapter",
   "dfpAdServerVideo",
   "emx_digitalBidAdapter",

diff --git a/modules/.submodules.json b/modules/.submodules.json
@@ -4,10 +4,15 @@
     "id5IdSystem",
     "criteortusIdSystem",
     "parrableIdSystem",
-    "liveIntentIdSystem"
+    "britepoolIdSystem",
+    "liveIntentIdSystem",
+    "criteoIdSystem"
   ],
   "adpod": [
     "freeWheelAdserverVideo",
     "dfpAdServerVideo"
+  ],
+  "rtdModule": [
+    "browsiRtdProvider"
   ]
 }