prebid.js 6.24.0 → 6.26.0

package/test/spec/modules/oguryBidAdapter_spec.js

@@ -226,6 +226,15 @@ describe('OguryBidAdapter', function () {
   });
 
   describe('buildRequests', function () {
+    const stubbedWidth = 200
+    const stubbedHeight = 600
+    const stubbedWidthMethod = sinon.stub(window.top.document.documentElement, 'clientWidth').get(function() {
+      return stubbedWidth;
+    });
+    const stubbedHeightMethod = sinon.stub(window.top.document.documentElement, 'clientHeight').get(function() {
+      return stubbedHeight;
+    });
+
     const defaultTimeout = 1000;
     const expectedRequestObject = {
       id: bidRequests[0].auctionId,
@@ -270,10 +279,19 @@ describe('OguryBidAdapter', function () {
       },
       ext: {
         prebidversion: '$prebid.version$',
-        adapterversion: '1.2.11'
+        adapterversion: '1.2.12'
+      },
+      device: {
+        w: stubbedWidth,
+        h: stubbedHeight
       }
     };
 
+    after(function() {
+      stubbedWidthMethod.restore();
+      stubbedHeightMethod.restore();
+    });
+
     it('sends bid request to ENDPOINT via POST', function () {
       const validBidRequests = utils.deepClone(bidRequests)
 
@@ -290,6 +308,166 @@ describe('OguryBidAdapter', function () {
       expect(request.data.regs.ext.gdpr).to.be.a('number');
     });
 
+    describe('getClientWidth', () => {
+      function testGetClientWidth(testGetClientSizeParams) {
+        const stubbedClientWidth = sinon.stub(window.top.document.documentElement, 'clientWidth').get(function() {
+          return testGetClientSizeParams.docClientSize
+        })
+
+        const stubbedInnerWidth = sinon.stub(window.top, 'innerWidth').get(function() {
+          return testGetClientSizeParams.innerSize
+        })
+
+        const stubbedOuterWidth = sinon.stub(window.top, 'outerWidth').get(function() {
+          return testGetClientSizeParams.outerSize
+        })
+
+        const stubbedWidth = sinon.stub(window.top.screen, 'width').get(function() {
+          return testGetClientSizeParams.screenSize
+        })
+
+        const validBidRequests = utils.deepClone(bidRequests)
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        expect(request.data.device.w).to.equal(testGetClientSizeParams.expectedSize);
+
+        stubbedClientWidth.restore();
+        stubbedInnerWidth.restore();
+        stubbedOuterWidth.restore();
+        stubbedWidth.restore();
+      }
+
+      it('should get documentElementClientWidth by default', () => {
+        testGetClientWidth({
+          docClientSize: 22,
+          innerSize: 50,
+          outerSize: 45,
+          screenSize: 10,
+          expectedSize: 22,
+        })
+      })
+
+      it('should get innerWidth as first fallback', () => {
+        testGetClientWidth({
+          docClientSize: undefined,
+          innerSize: 700,
+          outerSize: 650,
+          screenSize: 10,
+          expectedSize: 700,
+        })
+      })
+
+      it('should get outerWidth as second fallback', () => {
+        testGetClientWidth({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: 650,
+          screenSize: 10,
+          expectedSize: 650,
+        })
+      })
+
+      it('should get screenWidth as last fallback', () => {
+        testGetClientWidth({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: undefined,
+          screenSize: 10,
+          expectedSize: 10,
+        });
+      });
+
+      it('should return 0 if all window width values are undefined', () => {
+        testGetClientWidth({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: undefined,
+          screenSize: undefined,
+          expectedSize: 0,
+        });
+      });
+    });
+
+    describe('getClientHeight', () => {
+      function testGetClientHeight(testGetClientSizeParams) {
+        const stubbedClientHeight = sinon.stub(window.top.document.documentElement, 'clientHeight').get(function() {
+          return testGetClientSizeParams.docClientSize
+        })
+
+        const stubbedInnerHeight = sinon.stub(window.top, 'innerHeight').get(function() {
+          return testGetClientSizeParams.innerSize
+        })
+
+        const stubbedOuterHeight = sinon.stub(window.top, 'outerHeight').get(function() {
+          return testGetClientSizeParams.outerSize
+        })
+
+        const stubbedHeight = sinon.stub(window.top.screen, 'height').get(function() {
+          return testGetClientSizeParams.screenSize
+        })
+
+        const validBidRequests = utils.deepClone(bidRequests)
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        expect(request.data.device.h).to.equal(testGetClientSizeParams.expectedSize);
+
+        stubbedClientHeight.restore();
+        stubbedInnerHeight.restore();
+        stubbedOuterHeight.restore();
+        stubbedHeight.restore();
+      }
+
+      it('should get documentElementClientHeight by default', () => {
+        testGetClientHeight({
+          docClientSize: 420,
+          innerSize: 500,
+          outerSize: 480,
+          screenSize: 230,
+          expectedSize: 420,
+        });
+      });
+
+      it('should get innerHeight as first fallback', () => {
+        testGetClientHeight({
+          docClientSize: undefined,
+          innerSize: 500,
+          outerSize: 480,
+          screenSize: 230,
+          expectedSize: 500,
+        });
+      });
+
+      it('should get outerHeight as second fallback', () => {
+        testGetClientHeight({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: 480,
+          screenSize: 230,
+          expectedSize: 480,
+        });
+      });
+
+      it('should get screenHeight as last fallback', () => {
+        testGetClientHeight({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: undefined,
+          screenSize: 230,
+          expectedSize: 230,
+        });
+      });
+
+      it('should return 0 if all window height values are undefined', () => {
+        testGetClientHeight({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: undefined,
+          screenSize: undefined,
+          expectedSize: 0,
+        });
+      });
+    });
+
     it('should not add gdpr infos if not present', () => {
       const bidderRequestWithoutGdpr = {
         ...bidderRequest,
@@ -481,7 +659,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[0].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[0].nurl,
-        adapterVersion: '1.2.11',
+        adapterVersion: '1.2.12',
         prebidVersion: '$prebid.version$'
       }, {
         requestId: openRtbBidResponse.body.seatbid[0].bid[1].impid,
@@ -498,7 +676,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[1].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[1].nurl,
-        adapterVersion: '1.2.11',
+        adapterVersion: '1.2.12',
         prebidVersion: '$prebid.version$'
       }]
 

package/test/spec/modules/trustpidSystem_spec.js

@@ -22,11 +22,23 @@ describe('trustpid System', () => {
   });
 
   describe('trustpid getId()', () => {
+    before(() => {
+      window.FC_CONF = {
+        TELCO_ACRONYM: {
+          'domain.with.acronym': 'acronymValue',
+        }
+      };
+    });
+
     afterEach(() => {
       storage.removeDataFromLocalStorage(connectDataKey);
       storage.removeDataFromLocalStorage(connectDomainKey);
     });
 
+    after(() => {
+      window.FC_CONF = {};
+    })
+
     it('it should return object with key callback', () => {
       expect(trustpidSubmodule.getId()).to.have.property('callback');
     });
@@ -58,20 +70,20 @@ describe('trustpid System', () => {
 
     it('returns {id: {trustpid: data.trustpid}} if we have the right data stored in the localstorage ', () => {
       const idGraph = {
-        'domain': 'uat.mno.link',
+        'domain': 'domain.with.acronym',
         'umid': 'umidValue',
       };
-      storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('uat.mno.link'));
+      storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('domain.with.acronym'));
       storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
       const response = trustpidSubmodule.getId();
       expect(response).to.have.property('id');
       expect(response.id).to.have.property('trustpid');
-      expect(response.id.trustpid).to.be.equal('umidValue-xxxx');
+      expect(response.id.trustpid).to.be.equal('umidValue-acronymValue');
     });
 
     it('returns {trustpid: data.trustpid} if we have the right data stored in the localstorage right after the callback is called', (done) => {
       const idGraph = {
-        'domain': 'uat.mno.link',
+        'domain': 'domain.with.acronym',
         'umid': 'umidValue',
       };
       const response = trustpidSubmodule.getId();
@@ -79,12 +91,12 @@ describe('trustpid System', () => {
       expect(response.callback.toString()).contain('result(callback)');
 
       if (typeof response.callback === 'function') {
-        storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('uat.mno.link'));
+        storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('domain.with.acronym'));
         storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
         response.callback(function (result) {
           expect(result).to.not.be.null;
           expect(result).to.have.property('trustpid');
-          expect(result.trustpid).to.be.equal('umidValue-xxxx');
+          expect(result.trustpid).to.be.equal('umidValue-acronymValue');
           done()
         })
       }
@@ -92,7 +104,7 @@ describe('trustpid System', () => {
 
     it('returns null if domains don\'t match', (done) => {
       const idGraph = {
-        'domain': 'uat.mno.link',
+        'domain': 'domain.with.acronym',
         'umid': 'umidValue',
       };
       storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('differentDomainValue'));
@@ -115,7 +127,7 @@ describe('trustpid System', () => {
 
     it('returns {trustpid: data.trustpid} if we have the right data stored in the localstorage right after 500ms delay', (done) => {
       const idGraph = {
-        'domain': 'uat.mno.link',
+        'domain': 'domain.with.acronym',
         'umid': 'umidValue',
       };
 
@@ -125,13 +137,13 @@ describe('trustpid System', () => {
 
       if (typeof response.callback === 'function') {
         setTimeout(() => {
-          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('uat.mno.link'));
+          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('domain.with.acronym'));
           storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
         }, 500);
         response.callback(function (result) {
           expect(result).to.not.be.null;
           expect(result).to.have.property('trustpid');
-          expect(result.trustpid).to.be.equal('umidValue-xxxx');
+          expect(result.trustpid).to.be.equal('umidValue-acronymValue');
           done()
         })
       }
@@ -139,7 +151,7 @@ describe('trustpid System', () => {
 
     it('returns null if we have the data stored in the localstorage after 500ms delay and the max (waiting) delay is only 200ms ', (done) => {
       const idGraph = {
-        'domain': 'uat.mno.link',
+        'domain': 'domain.with.acronym',
         'umid': 'umidValue',
       };
 
@@ -149,7 +161,7 @@ describe('trustpid System', () => {
 
       if (typeof response.callback === 'function') {
         setTimeout(() => {
-          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('uat.mno.link'));
+          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('domain.with.acronym'));
           storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
         }, 500);
         response.callback(function (result) {
@@ -191,22 +203,33 @@ describe('trustpid System', () => {
   });
 
   describe('trustpid messageHandler for acronyms', () => {
+    before(() => {
+      window.FC_CONF = {
+        TELCO_ACRONYM: {
+          'domain1': 'abcd',
+          'domain2': 'efgh',
+          'domain3': 'ijkl',
+        }
+      };
+    });
+
     afterEach(() => {
       storage.removeDataFromLocalStorage(connectDataKey);
       storage.removeDataFromLocalStorage(connectDomainKey);
     });
 
+    after(() => {
+      window.FC_CONF = {};
+    })
+
     const domains = [
-      {domain: 'tmi.mno.link', acronym: 'ndye'},
-      {domain: 'tmi.vodafone.de', acronym: 'pqnx'},
-      {domain: 'tmi.telekom.de', acronym: 'avgw'},
-      {domain: 'tmi.tmid.es', acronym: 'kjws'},
-      {domain: 'uat.mno.link', acronym: 'xxxx'},
-      {domain: 'es.tmiservice.orange.com', acronym: 'aplw'},
+      {domain: 'domain1', acronym: 'abcd'},
+      {domain: 'domain2', acronym: 'efgh'},
+      {domain: 'domain3', acronym: 'ijkl'},
     ];
 
     domains.forEach(({domain, acronym}) => {
-      it(`correctly sets trustpid value and acronym to ${acronym} for ${domain} domain`, (done) => {
+      it(`correctly sets trustpid value and acronym to ${acronym} for ${domain}`, (done) => {
         const idGraph = {
           'domain': domain,
           'umid': 'umidValue',

package/test/spec/modules/userId_spec.js

@@ -52,6 +52,7 @@ import * as mockGpt from '../integration/faker/googletag.js';
 import 'src/prebid.js';
 import {hook} from '../../../src/hook.js';
 import {mockGdprConsent} from '../../helpers/consentData.js';
+import {getPPID} from '../../../src/adserver.js';
 
 let assert = require('chai').assert;
 let expect = require('chai').expect;
@@ -445,6 +446,23 @@ describe('User ID', function () {
       });
     });
 
+    it('should make PPID available to core', () => {
+      init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+      const id = 'thishastobelongerthan32characters';
+      config.setConfig({
+        userSync: {
+          ppid: 'pubcid.org',
+          userIds: [
+            { name: 'pubCommonId', value: {'pubcid': id} },
+          ]
+        }
+      });
+      return getGlobal().refreshUserIds().then(() => {
+        expect(getPPID()).to.eql(id);
+      })
+    });
+
     describe('refreshing before init is complete', () => {
       const MOCK_ID = {'MOCKID': '1111'};
       let mockIdCallback;