prebid.js 6.2.0 → 6.6.0

package/test/spec/modules/zeta_global_sspBidAdapter_spec.js

@@ -1,4 +1,5 @@
 import {spec} from '../../../modules/zeta_global_sspBidAdapter.js'
+import {BANNER, VIDEO} from '../../../src/mediaTypes';
 
 describe('Zeta Ssp Bid Adapter', function () {
   const eids = [
@@ -143,7 +144,22 @@ describe('Zeta Ssp Bid Adapter', function () {
                   'https://example2.com'
                 ],
                 h: 150,
-                w: 200
+                w: 200,
+                ext: {
+                  bidtype: 'video'
+                }
+              },
+              {
+                id: 'auctionId3',
+                impid: 'impId3',
+                price: 0.2,
+                adm: '<?xml version=\\"1.0\\"?><VAST version=\\"4.0\\">',
+                crid: 'creativeId3',
+                adomain: [
+                  'https://example3.com'
+                ],
+                h: 400,
+                w: 300
               }
             ]
           }
@@ -159,6 +175,8 @@ describe('Zeta Ssp Bid Adapter', function () {
     const receivedBid1 = response.body.seatbid[0].bid[0];
     expect(bid1).to.not.be.empty;
     expect(bid1.ad).to.equal(receivedBid1.adm);
+    expect(bid1.vastXml).to.be.undefined;
+    expect(bid1.mediaType).to.equal(BANNER);
     expect(bid1.cpm).to.equal(receivedBid1.price);
     expect(bid1.height).to.equal(receivedBid1.h);
     expect(bid1.width).to.equal(receivedBid1.w);
@@ -169,11 +187,25 @@ describe('Zeta Ssp Bid Adapter', function () {
     const receivedBid2 = response.body.seatbid[0].bid[1];
     expect(bid2).to.not.be.empty;
     expect(bid2.ad).to.equal(receivedBid2.adm);
+    expect(bid2.vastXml).to.equal(receivedBid2.adm);
+    expect(bid2.mediaType).to.equal(VIDEO);
     expect(bid2.cpm).to.equal(receivedBid2.price);
     expect(bid2.height).to.equal(receivedBid2.h);
     expect(bid2.width).to.equal(receivedBid2.w);
     expect(bid2.requestId).to.equal(receivedBid2.impid);
     expect(bid2.meta.advertiserDomains).to.equal(receivedBid2.adomain);
+
+    const bid3 = bidResponse[2];
+    const receivedBid3 = response.body.seatbid[0].bid[2];
+    expect(bid3).to.not.be.empty;
+    expect(bid3.ad).to.equal(receivedBid3.adm);
+    expect(bid3.vastXml).to.equal(receivedBid3.adm);
+    expect(bid3.mediaType).to.equal(VIDEO);
+    expect(bid3.cpm).to.equal(receivedBid3.price);
+    expect(bid3.height).to.equal(receivedBid3.h);
+    expect(bid3.width).to.equal(receivedBid3.w);
+    expect(bid3.requestId).to.equal(receivedBid3.impid);
+    expect(bid3.meta.advertiserDomains).to.equal(receivedBid3.adomain);
   });
 
   it('Different cases for user syncs', function () {

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

@@ -5,6 +5,7 @@ import { createBidReceived } from 'test/fixtures/fixtures.js';
 import CONSTANTS from 'src/constants.json';
 import { auctionManager } from 'src/auctionManager.js';
 import * as utils from 'src/utils.js';
+import {deepClone} from 'src/utils.js';
 
 const bid1 = {
   'bidderCode': 'rubicon',
@@ -545,6 +546,77 @@ describe('targeting tests', function () {
       });
     });
 
+    describe('targetingControls.addTargetingKeys', function () {
+      let winningBid = null;
+
+      beforeEach(function () {
+        bidsReceived = [bid1, bid2, nativeBid1, nativeBid2].map(deepClone);
+        bidsReceived.forEach((bid) => {
+          bid.adserverTargeting[CONSTANTS.TARGETING_KEYS.SOURCE] = 'test-source';
+          bid.adUnitCode = 'adunit';
+          if (winningBid == null || bid.cpm > winningBid.cpm) {
+            winningBid = bid;
+          }
+        });
+        enableSendAllBids = true;
+      });
+
+      const expandKey = function (key) {
+        const keys = new Set();
+        if (winningBid.adserverTargeting[key] != null) {
+          keys.add(key);
+        }
+        bidsReceived
+          .filter((bid) => bid.adserverTargeting[key] != null)
+          .map((bid) => bid.bidderCode)
+          .forEach((code) => keys.add(`${key}_${code}`.substr(0, 20)));
+        return new Array(...keys);
+      }
+
+      const targetingResult = function () {
+        return targetingInstance.getAllTargeting(['adunit'])['adunit'];
+      }
+
+      it('should include added keys', function () {
+        config.setConfig({
+          targetingControls: {
+            addTargetingKeys: ['SOURCE']
+          }
+        });
+        expect(targetingResult()).to.include.all.keys(...expandKey(CONSTANTS.TARGETING_KEYS.SOURCE));
+      });
+
+      it('should keep default and native keys', function() {
+        config.setConfig({
+          targetingControls: {
+            addTargetingKeys: ['SOURCE']
+          }
+        });
+        const defaultKeys = new Set(Object.values(CONSTANTS.DEFAULT_TARGETING_KEYS));
+        Object.values(CONSTANTS.NATIVE_KEYS).forEach((k) => defaultKeys.add(k));
+
+        const expectedKeys = new Set();
+        bidsReceived
+          .map((bid) => Object.keys(bid.adserverTargeting))
+          .reduce((left, right) => left.concat(right), [])
+          .filter((key) => defaultKeys.has(key))
+          .map(expandKey)
+          .reduce((left, right) => left.concat(right), [])
+          .forEach((k) => expectedKeys.add(k));
+        expect(targetingResult()).to.include.all.keys(...expectedKeys);
+      });
+
+      it('should not be allowed together with allowTargetingKeys', function () {
+        config.setConfig({
+          targetingControls: {
+            allowTargetingKeys: [CONSTANTS.TARGETING_KEYS.BIDDER],
+            addTargetingKeys: [CONSTANTS.TARGETING_KEYS.SOURCE]
+          }
+        });
+        expect(targetingResult).to.throw();
+      });
+    });
+
     describe('targetingControls.allowSendAllBidsTargetingKeys', function () {
       let bid4;
 

package/test/spec/unit/pbjs_api_spec.js

@@ -1135,13 +1135,15 @@ describe('Unit: Prebid Module', function () {
             height: 0
           }
         },
-        getElementsByTagName: sinon.stub()
+        getElementsByTagName: sinon.stub(),
+        querySelector: sinon.stub()
       };
 
       elStub = {
         insertBefore: sinon.stub()
       };
       doc.getElementsByTagName.returns([elStub]);
+      doc.querySelector.returns(elStub);
 
       spyLogError = sinon.spy(utils, 'logError');
       spyLogMessage = sinon.spy(utils, 'logMessage');

package/test/spec/utils_spec.js

@@ -2,6 +2,7 @@ import { getAdServerTargeting } from 'test/fixtures/fixtures.js';
 import { expect } from 'chai';
 import CONSTANTS from 'src/constants.json';
 import * as utils from 'src/utils.js';
+import {waitForElementToLoad} from 'src/utils.js';
 
 var assert = require('assert');
 
@@ -1198,4 +1199,41 @@ describe('Utils', function () {
       });
     });
   });
+
+  describe('waitForElementToLoad', () => {
+    let element;
+    let callbacks;
+
+    function callback() {
+      callbacks++;
+    }
+
+    function delay(delay = 0) {
+      return new Promise((resolve) => {
+        window.setTimeout(resolve, delay);
+      })
+    }
+
+    beforeEach(() => {
+      callbacks = 0;
+      element = window.document.createElement('div');
+    });
+
+    it('should respect timeout if set', () => {
+      waitForElementToLoad(element, 50).then(callback);
+      return delay(60).then(() => {
+        expect(callbacks).to.equal(1);
+      });
+    });
+
+    ['load', 'error'].forEach((event) => {
+      it(`should complete on '${event} event'`, () => {
+        waitForElementToLoad(element).then(callback);
+        element.dispatchEvent(new Event(event));
+        return delay().then(() => {
+          expect(callbacks).to.equal(1);
+        })
+      });
+    });
+  });
 });

package/test/test_deps.js

@@ -0,0 +1,3 @@
+require('test/helpers/prebidGlobal.js');
+require('test/mocks/adloaderStub.js');
+require('test/mocks/xhr.js');

package/test/test_index.js

@@ -1,6 +1,4 @@
-require('test/helpers/prebidGlobal.js');
-require('test/mocks/adloaderStub.js');
-require('test/mocks/xhr.js');
+require('./test_deps.js');
 
 var testsContext = require.context('.', true, /_spec$/);
 testsContext.keys().forEach(testsContext);