prebid.js 8.4.0 → 8.6.0

package/test/spec/modules/yahoosspBidAdapter_spec.js

@@ -969,23 +969,7 @@ describe('Yahoo Advertising Bid Adapter:', () => {
   describe('User data', () => {
     it('should set the allowed sources user eids', () => {
       const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
-      validBidRequests[0].userIdAsEids = createEidsArray({
-        connectId: 'connectId_FROM_USER_ID_MODULE',
-        admixerId: 'admixerId_FROM_USER_ID_MODULE',
-        adtelligentId: 'adtelligentId_FROM_USER_ID_MODULE',
-        amxId: 'amxId_FROM_USER_ID_MODULE',
-        britepoolid: 'britepoolid_FROM_USER_ID_MODULE',
-        deepintentId: 'deepintentId_FROM_USER_ID_MODULE',
-        publinkId: 'publinkId_FROM_USER_ID_MODULE',
-        intentIqId: 'intentIqId_FROM_USER_ID_MODULE',
-        idl_env: 'idl_env_FROM_USER_ID_MODULE',
-        imuid: 'imuid_FROM_USER_ID_MODULE',
-        criteoId: 'criteoId_FROM_USER_ID_MODULE',
-        fabrickId: 'fabrickId_FROM_USER_ID_MODULE',
-      });
-      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
-
-      expect(data.user.ext.eids).to.deep.equal([
+      validBidRequests[0].userIdAsEids = [
         {source: 'yahoo.com', uids: [{id: 'connectId_FROM_USER_ID_MODULE', atype: 3}]},
         {source: 'admixer.net', uids: [{id: 'admixerId_FROM_USER_ID_MODULE', atype: 3}]},
         {source: 'adtelligent.com', uids: [{id: 'adtelligentId_FROM_USER_ID_MODULE', atype: 3}]},
@@ -998,7 +982,10 @@ describe('Yahoo Advertising Bid Adapter:', () => {
         {source: 'intimatemerger.com', uids: [{id: 'imuid_FROM_USER_ID_MODULE', atype: 1}]},
         {source: 'criteo.com', uids: [{id: 'criteoId_FROM_USER_ID_MODULE', atype: 1}]},
         {source: 'neustar.biz', uids: [{id: 'fabrickId_FROM_USER_ID_MODULE', atype: 1}]}
-      ]);
+      ];
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+
+      expect(data.user.ext.eids).to.deep.equal(validBidRequests[0].userIdAsEids);
     });
 
     it('should not set not allowed user eids sources', () => {

package/test/spec/unit/core/bidderFactory_spec.js

@@ -13,7 +13,6 @@ import {stubAuctionIndex} from '../../../helpers/indexStub.js';
 import {bidderSettings} from '../../../../src/bidderSettings.js';
 import {decorateAdUnitsWithNativeParams} from '../../../../src/native.js';
 import * as activityRules from 'src/activities/rules.js';
-import {sandbox} from 'sinon';
 import {MODULE_TYPE_BIDDER} from '../../../../src/activities/modules.js';
 import {ACTIVITY_TRANSMIT_TID} from '../../../../src/activities/activities.js';
 
@@ -141,6 +140,21 @@ describe('bidders created by newBidder', function () {
     });
 
     describe('transaction IDs', () => {
+      beforeEach(() => {
+        activityRules.isActivityAllowed.reset();
+        ajaxStub.callsFake((_, callback) => callback.success(null, {getResponseHeader: sinon.stub()}));
+        spec.interpretResponse.callsFake(() => [
+          {
+            requestId: 'bid',
+            cpm: 123,
+            ttl: 300,
+            creativeId: 'crid',
+            netRevenue: true,
+            currency: 'USD'
+          }
+        ])
+      });
+
       Object.entries({
         'be hidden': false,
         'not be hidden': true,
@@ -166,21 +180,8 @@ describe('bidders created by newBidder', function () {
             bidReqs.forEach(checkBidRequest);
             return {method: 'POST'};
           });
-          spec.interpretResponse.callsFake(() => [
-            {
-              requestId: 'bid',
-              cpm: 123,
-              ttl: 300,
-              creativeId: 'crid',
-              netRevenue: true,
-              currency: 'USD'
-            }
-          ])
-          activityRules.isActivityAllowed.reset();
           activityRules.isActivityAllowed.callsFake(() => allowed);
 
-          ajaxStub.callsFake((_, callback) => callback.success(null, {getResponseHeader: sinon.stub()}));
-
           const bidder = newBidder(spec);
 
           bidder.callBids({
@@ -206,6 +207,33 @@ describe('bidders created by newBidder', function () {
           })
         });
       });
+
+      it('should not be hidden from request methods', (done) => {
+        const bidderRequest = {
+          bidderCode: 'mockBidder',
+          auctionId: 'aid',
+          getAID() { return this.auctionId },
+          bids: [
+            {
+              adUnitCode: 'mockAU',
+              bidId: 'bid',
+              transactionId: 'tid',
+              auctionId: 'aid',
+              getTIDs() {
+                return [this.auctionId, this.transactionId]
+              }
+            }
+          ]
+        };
+        activityRules.isActivityAllowed.callsFake(() => false);
+        spec.isBidRequestValid.returns(true);
+        spec.buildRequests.callsFake((reqs, bidderReq) => {
+          expect(bidderReq.getAID()).to.eql('aid');
+          expect(reqs[0].getTIDs()).to.eql(['aid', 'tid']);
+          done();
+        });
+        newBidder(spec).callBids(bidderRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+      })
     });
 
     it('should handle bad bid requests gracefully', function () {
@@ -1107,6 +1135,25 @@ describe('validate bid response: ', function () {
     expect(logErrorSpy.callCount).to.equal(0);
   });
 
+  it('should disregard auctionId/transactionId set by the adapter', () => {
+    let bidderRequest = {
+      bids: [{
+        bidder: CODE,
+        bidId: '1',
+        auctionId: 'aid',
+        transactionId: 'tid',
+        adUnitCode: 'au',
+      }]
+    };
+    const bidder = newBidder(spec);
+    spec.interpretResponse.returns(Object.assign({}, bids[0], {transactionId: 'ignored', auctionId: 'ignored'}));
+    bidder.callBids(bidderRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+    sinon.assert.calledWith(addBidResponseStub, sinon.match.any, sinon.match({
+      transactionId: 'tid',
+      auctionId: 'aid'
+    }));
+  })
+
   describe(' Check for alternateBiddersList ', function() {
     let bidRequest;
     let bids1;

package/integrationExamples/gpt/pbjs_video_adUnit.html

@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <title>Prebid.js video adUnit example</title>
-
-  <link href="http://vjs.zencdn.net/4.7.1/video-js.css" rel="stylesheet">
-  <link href="https://raw.githubusercontent.com/theonion/videojs-vast-plugin/master/lib/videojs-contrib-ads/videojs.ads.css" rel="stylesheet" type="text/css">
-  <link href="https://raw.githubusercontent.com/theonion/videojs-vast-plugin/master/videojs.vast.css" rel="stylesheet" type="text/css">
-
-  <style type="text/css">
-    .description {
-      background-color:#eee;
-      border: 1px solid #777;
-      padding: 10px;
-      font-size: .8em;
-      line-height: 1.5em;
-      font-family: Verdana, sans-serif;
-    }
-    .example-video-container {
-      display: inline-block;
-    }
-  </style>
-  <script src="/build/dev/prebid.js" async=true></script>
-  <script>
-
-  var pbjs = pbjs || {};
-  pbjs.que = pbjs.que || [];
-
-/*
-adUnits can support video demand requests by setting 'mediaType' to
-'video'. When an adUnit is configured to support video, all bidders
-within that adUnit must be video-enabled as well, as configured in
-adapters.json.
-*/
-  var videoAdUnit = {
-    code: 'video1',
-    sizes: [640,480],
-    mediaTypes: { video: {} },
-    bids: [
-      {
-        bidder: 'appnexusAst',
-        params: {
-          placementId: '123456',
-          video: {
-            id: 123,
-            skipppable: true,
-            playback_method: ['auto_play_sound_off']
-          }
-        }
-      }
-    ]
-  };
-
-  pbjs.que.push(function(){
-    pbjs.addAdUnits(videoAdUnit);
-    pbjs.requestBids({
-      timeout : 3000,
-      bidsBackHandler : function(bids) {
-        var adserverTag = '<dfp_tag>'; // base ad server tag, see: https://support.google.com/dfp_premium/answer/1068325
-        var options = {
-          'adserver': 'dfp',
-          'code': 'video1' //code that matches the video adUnit declared above
-         };
-        //generate URL
-        var masterTagUrl = pbjs.buildMasterVideoTagFromAdserverTag(adserverTag, options);
-        //send masterTagUrl to the video player
-        invokeVideoPlayer(masterTagUrl);
-
-      }
-    });
-  });
-
-
-  </script>
-</head>
-<body>
-
-  <div class="example-video-container">
-    <video id="vid1" class="video-js vjs-default-skin" autoplay controls preload="auto"
-        poster="http://video-js.zencoder.com/oceans-clip.png"
-        data-setup='{}'
-        width='640'
-        height='480'
-        >
-      <source src="http://vjs.zencdn.net/v/oceans.mp4" type='video/mp4'>
-
-      <p>Video Playback Not Supported</p>
-    </video>
-  </div>
-
-  <script>
-
-    var vid1 = videojs('vid1');
-    vid1.muted(true);
-    vid1.ads();
-
-    /*
-    This function called after prebid is back
-     */
-    function invokeVideoPlayer(url) {
-      vid1.vast({
-        url: url
-      });
-    }
-  </script>
-
-</body>
-</html>