prebid.js 7.16.0 → 7.18.0

package/test/spec/modules/ixBidAdapter_spec.js

@@ -1588,7 +1588,7 @@ describe('IndexexchangeAdapter', function () {
           search: 'drill',
         },
         user: {
-          keywords: Array(1000).join('#'),
+          keywords: Array(1200).join('#'),
         }
       };
 
@@ -1772,21 +1772,21 @@ describe('IndexexchangeAdapter', function () {
 
     it('impression should have correct format and value', function () {
       const impression = JSON.parse(query.r).imp[0];
+      const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
       expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
       expect(impression.banner.format).to.be.length(2);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
       expect(impression.banner.pos).to.equal(0);
       expect(impression.ext.tid).to.equal(DEFAULT_BANNER_VALID_BID[0].transactionId);
+      expect(impression.ext.sid).to.equal(sidValue);
 
       impression.banner.format.map(({ w, h, ext }, index) => {
         const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];
-        const sidValue = utils.parseGPTSingleSizeArray(size);
 
         expect(w).to.equal(size[0]);
         expect(h).to.equal(size[1]);
         expect(ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-        expect(ext.sid).to.equal(sidValue);
       });
     });
 
@@ -1934,7 +1934,7 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.banner.format[0].h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
       expect(impression.banner.format[0].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-      expect(impression.banner.format[0].ext.sid).to.equal('50');
+      expect(impression.ext.sid).to.equal('50');
     });
 
     it('impression should have sid if id is configured as string', function () {
@@ -1948,7 +1948,7 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.banner.format[0].h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
       expect(impression.banner.format[0].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-      expect(impression.banner.format[0].ext.sid).to.equal('abc');
+      expect(impression.ext.sid).to.equal('abc');
     });
 
     describe('first party data', () => {
@@ -2034,6 +2034,7 @@ describe('IndexexchangeAdapter', function () {
       const request = spec.buildRequests([DEFAULT_BANNER_VALID_BID[0], DEFAULT_VIDEO_VALID_BID[0]], {});
       it('should have banner request', () => {
         const bannerImpression = JSON.parse(request[0].data.r).imp[0];
+        const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
         expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(1);
         expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
@@ -2041,15 +2042,14 @@ describe('IndexexchangeAdapter', function () {
 
         expect(bannerImpression.banner.format).to.be.length(2);
         expect(bannerImpression.banner.topframe).to.be.oneOf([0, 1]);
+        expect(bannerImpression.ext.sid).to.equal(sidValue);
 
         bannerImpression.banner.format.map(({ w, h, ext }, index) => {
           const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];
-          const sidValue = utils.parseGPTSingleSizeArray(size);
 
           expect(w).to.equal(size[0]);
           expect(h).to.equal(size[1]);
           expect(ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-          expect(ext.sid).to.equal(sidValue);
         });
       });
 
@@ -2068,6 +2068,7 @@ describe('IndexexchangeAdapter', function () {
 
       it('should have banner request', () => {
         const bannerImpression = JSON.parse(request[0].data.r).imp[0];
+        const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
         expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(1);
         expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
@@ -2075,15 +2076,14 @@ describe('IndexexchangeAdapter', function () {
 
         expect(bannerImpression.banner.format).to.be.length(2);
         expect(bannerImpression.banner.topframe).to.be.oneOf([0, 1]);
+        expect(bannerImpression.ext.sid).to.equal(sidValue);
 
         bannerImpression.banner.format.map(({ w, h, ext }, index) => {
           const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];
-          const sidValue = utils.parseGPTSingleSizeArray(size);
 
           expect(w).to.equal(size[0]);
           expect(h).to.equal(size[1]);
           expect(ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-          expect(ext.sid).to.equal(sidValue);
         });
       });
 
@@ -2200,19 +2200,19 @@ describe('IndexexchangeAdapter', function () {
 
       const request = spec.buildRequests([bid, bid2], DEFAULT_OPTION)[0];
       const impression = JSON.parse(request.data.r).imp[0];
+      const sidValue = bid.params.id;
 
       expect(impression.id).to.equal(bid.bidId);
       expect(impression.banner.format).to.be.length(bid.mediaTypes.banner.sizes.length);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+      expect(impression.ext.sid).to.equal(sidValue);
 
       impression.banner.format.map(({ w, h, ext }, index) => {
         const size = bid.mediaTypes.banner.sizes[index];
-        const sidValue = utils.parseGPTSingleSizeArray(size);
 
         expect(w).to.equal(size[0]);
         expect(h).to.equal(size[1]);
         expect(ext.siteID).to.equal(index === 1 ? bid2.params.siteId : bid.params.siteId);
-        expect(ext.sid).to.equal(sidValue);
       });
     });
 
@@ -2236,18 +2236,18 @@ describe('IndexexchangeAdapter', function () {
 
       impressions.map((impression, impressionIndex) => {
         const firstSizeObject = bids[impressionIndex].mediaTypes.banner.sizes[0];
+        const sidValue = bids[impressionIndex].params.id;
 
         expect(impression.banner.format).to.be.length(2);
         expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+        expect(impression.ext.sid).to.equal(sidValue);
 
         impression.banner.format.map(({ w, h, ext }, index) => {
           const size = bids[impressionIndex].mediaTypes.banner.sizes[index];
-          const sidValue = utils.parseGPTSingleSizeArray(size);
 
           expect(w).to.equal(size[0]);
           expect(h).to.equal(size[1]);
           expect(ext.siteID).to.equal(bids[impressionIndex].params.siteId);
-          expect(ext.sid).to.equal(sidValue);
         });
       });
     });
@@ -2295,7 +2295,6 @@ describe('IndexexchangeAdapter', function () {
 
     it('impression should have correct format and value', function () {
       const impression = JSON.parse(query.r).imp[0];
-      const sidValue = utils.parseGPTSingleSizeArray(DEFAULT_VIDEO_VALID_BID[0].params.size);
 
       expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
       expect(impression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
@@ -2320,6 +2319,15 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.video.placement).to.equal(2);
     });
 
+    it('should set imp.ext.sid for video imps if params.id exists', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.params.id = 50;
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = JSON.parse(request.data.r).imp[0];
+
+      expect(impression.ext.sid).to.equal('50');
+    });
+
     it('should set correct default placement, if context is instream', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.mediaTypes.video.context = 'instream';
@@ -2460,6 +2468,16 @@ describe('IndexexchangeAdapter', function () {
       expect(nativeImpression.native).to.deep.equal(DEFAULT_NATIVE_IMP);
     });
 
+    it('should set imp.ext.sid for native imps if params.id exist', function() {
+      const bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID);
+      bid[0].params.id = 'abc'
+      const request = spec.buildRequests(bid, DEFAULT_OPTION);
+      const nativeImpression = JSON.parse(request[0].data.r).imp[0];
+
+      expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
+      expect(nativeImpression.ext.sid).to.equal('abc');
+    });
+
     it('should build request with given asset properties', function() {
       let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID)
       bid[0].nativeOrtbRequest = {
@@ -2642,12 +2660,10 @@ describe('IndexexchangeAdapter', function () {
 
           impression.banner.format.map(({ w, h, ext }, index) => {
             const size = bid.mediaTypes.banner.sizes[index];
-            const sidValue = utils.parseGPTSingleSizeArray(size);
 
             expect(w).to.equal(size[0]);
             expect(h).to.equal(size[1]);
             expect(ext.siteID).to.equal(bid.params.siteId);
-            expect(ext.sid).to.equal(sidValue);
           });
         });
       });

package/test/spec/modules/mediasquareBidAdapter_spec.js

@@ -88,6 +88,8 @@ describe('MediaSquare bid adapter tests', function () {
       'height': 250,
       'creative_id': '158534630',
       'currency': 'USD',
+      'originalCpm': 25.0123,
+      'originalCurrency': 'USD',
       'net_revenue': true,
       'ttl': 300,
       'ad': '< --- creative code --- >',

package/test/spec/modules/prebidServerBidAdapter_spec.js

@@ -3469,5 +3469,17 @@ describe('S2S Adapter', function () {
 
       expect(requestBid.ext.prebid.floors).to.deep.equal({ enabled: false });
     });
+
+    it('should override prebid server default DEFAULT_S2S_CURRENCY', function () {
+      config.setConfig({
+        currency: { adServerCurrency: 'JPY' },
+      });
+
+      const bidRequests = utils.deepClone(BID_REQUESTS);
+      adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
+
+      const parsedRequestBody = JSON.parse(server.requests[1].requestBody);
+      expect(parsedRequestBody.cur).to.deep.equal(['JPY']);
+    });
   });
 });

package/test/spec/modules/rubiconAnalyticsAdapter_spec.js

@@ -2366,7 +2366,7 @@ describe('rubicon analytics adapter', function () {
       });
       basicBillingAuction([{
         vendor: 'vendorName',
-        type: 'auction',
+        type: 'pageView',
         billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
       }]);
       expect(server.requests.length).to.equal(1);
@@ -2376,7 +2376,7 @@ describe('rubicon analytics adapter', function () {
       expect(message.billableEvents).to.deep.equal([{
         accountId: 1001,
         vendor: 'vendorName',
-        type: 'general', // mapping all events to endpoint as 'general' for now
+        type: 'pageView',
         billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
       }]);
     });
@@ -2398,7 +2398,7 @@ describe('rubicon analytics adapter', function () {
         },
         {
           vendor: 'vendorName',
-          type: 'auction',
+          type: 'impression',
           billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f'
         },
         {
@@ -2415,13 +2415,13 @@ describe('rubicon analytics adapter', function () {
         {
           accountId: 1001,
           vendor: 'vendorName',
-          type: 'general',
+          type: 'auction',
           billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
         },
         {
           accountId: 1001,
           vendor: 'vendorName',
-          type: 'general',
+          type: 'impression',
           billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f'
         }
       ]);
@@ -2450,7 +2450,7 @@ describe('rubicon analytics adapter', function () {
         {
           accountId: 1001,
           vendor: 'vendorName',
-          type: 'general',
+          type: 'auction',
           billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
         }
       ]);
@@ -2480,7 +2480,7 @@ describe('rubicon analytics adapter', function () {
         {
           accountId: 1001,
           vendor: 'vendorName',
-          type: 'general',
+          type: 'auction',
           billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
         }
       ]);

package/test/spec/modules/rubiconBidAdapter_spec.js

@@ -4,7 +4,7 @@ import {
   getPriceGranularity,
   masSizeOrdering,
   resetUserSync,
-  hasVideoMediaType,
+  classifiedAsVideo,
   resetRubiConf
 } from 'modules/rubiconBidAdapter.js';
 import {parse as parseQuery} from 'querystring';
@@ -257,7 +257,7 @@ describe('the rubicon adapter', function () {
         context: 'instream'
       },
     };
-    bid.params.video = '';
+    bid.params.video = false;
   }
 
   function createVideoBidderRequestOutstream() {
@@ -2320,57 +2320,50 @@ describe('the rubicon adapter', function () {
         });
       });
 
-      describe('hasVideoMediaType', function () {
-        it('should return true if mediaType is video and size_id is set', function () {
+      describe('classifiedAsVideo', function () {
+        it('should return true if mediaTypes is video', function () {
           createVideoBidderRequest();
-          const legacyVideoTypeBidRequest = hasVideoMediaType(bidderRequest.bids[0]);
-          expect(legacyVideoTypeBidRequest).is.equal(true);
+          const bidClassifiedAsVideo = classifiedAsVideo(bidderRequest.bids[0]);
+          expect(bidClassifiedAsVideo).is.equal(true);
         });
 
         it('should return false if trying to use legacy mediaType with video', function () {
           createVideoBidderRequest();
           delete bidderRequest.bids[0].mediaTypes;
           bidderRequest.bids[0].mediaType = 'video';
-          const legacyVideoTypeBidRequest = hasVideoMediaType(bidderRequest.bids[0]);
+          const legacyVideoTypeBidRequest = classifiedAsVideo(bidderRequest.bids[0]);
           expect(legacyVideoTypeBidRequest).is.equal(false);
         });
 
-        it('should return false if bidRequest.mediaType is not equal to video', function () {
-          expect(hasVideoMediaType({
+        it('should return false if bid.mediaTypes is not equal to video', function () {
+          expect(classifiedAsVideo({
             mediaType: 'banner'
           })).is.equal(false);
         });
 
-        it('should return false if bidRequest.mediaType is not defined', function () {
-          expect(hasVideoMediaType({})).is.equal(false);
+        it('should return false if bid.mediaTypes is not defined', function () {
+          expect(classifiedAsVideo({})).is.equal(false);
         });
 
-        it('should return true if bidRequest.mediaTypes.video.context is instream and size_id is defined', function () {
-          expect(hasVideoMediaType({
-            mediaTypes: {
-              video: {
-                context: 'instream'
-              }
-            },
-            params: {
-              video: {
-                size_id: 7
-              }
-            }
-          })).is.equal(true);
+        it('Should return false if both banner and video mediaTypes are set and params.video is not an object', function () {
+          createVideoBidderRequestNoVideo();
+          let bid = bidderRequest.bids[0];
+          bid.mediaTypes.banner = {flag: true};
+          expect(classifiedAsVideo(bid)).to.equal(false);
+        });
+        it('Should return true if both banner and video mediaTypes are set and params.video is an object', function () {
+          createVideoBidderRequestNoVideo();
+          let bid = bidderRequest.bids[0];
+          bid.mediaTypes.banner = {flag: true};
+          bid.params.video = {};
+          expect(classifiedAsVideo(bid)).to.equal(true);
         });
 
-        it('should return false if bidRequest.mediaTypes.video.context is instream but size_id is not defined', function () {
-          expect(spec.isBidRequestValid({
-            mediaTypes: {
-              video: {
-                context: 'instream'
-              }
-            },
-            params: {
-              video: {}
-            }
-          })).is.equal(false);
+        it('Should return true and create a params.video object if one is not already present', function () {
+          createVideoBidderRequestNoVideo();
+          let bid = bidderRequest.bids[0]
+          expect(classifiedAsVideo(bid)).to.equal(true);
+          expect(bid.params.video).to.not.be.undefined;
         });
       });
     });

package/test/spec/modules/seedtagBidAdapter_spec.js

@@ -356,6 +356,51 @@ describe('Seedtag Adapter', function () {
         expect(videoBid.requestCount).to.equal(1);
       });
     });
+
+    describe('schain param', function () {
+      it('should add schain to payload when exposed on validBidRequest', function () {
+        // https://github.com/prebid/Prebid.js/blob/master/modules/schain.md#sample-code-for-passing-the-schain-object
+        const schain = {
+          validation: 'strict',
+          config: {
+            ver: '1.0',
+            complete: 1,
+            nodes: [
+              {
+                asi: 'indirectseller.com',
+                sid: '00001',
+                hp: 1,
+              },
+
+              {
+                asi: 'indirectseller-2.com',
+                sid: '00002',
+                hp: 1,
+              },
+            ],
+          },
+        };
+
+        // duplicate
+        const bidRequests = JSON.parse(JSON.stringify(validBidRequests))
+        bidRequests[0].schain = schain;
+
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+
+        const payload = JSON.parse(request.data);
+
+        expect(payload.schain).to.exist;
+        expect(payload.schain).to.deep.equal(schain);
+      });
+
+      it("shouldn't add schain to payload when not exposed", function () {
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+
+        const payload = JSON.parse(request.data);
+
+        expect(payload.schain).to.not.exist;
+      });
+    });
   });
 
   describe('interpret response method', function () {