prebid.js 8.43.0 → 8.45.0

package/test/spec/modules/adagioAnalyticsAdapter_spec.js

@@ -1,12 +1,12 @@
 import adagioAnalyticsAdapter from 'modules/adagioAnalyticsAdapter.js';
 import { expect } from 'chai';
 import * as utils from 'src/utils.js';
-import { getGlobal } from 'src/prebidGlobal.js';
 import { server } from 'test/mocks/xhr.js';
+import * as prebidGlobal from 'src/prebidGlobal.js';
+import { EVENTS } from 'src/constants.js';
 
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('adagio analytics adapter - adagio.js', () => {
   let sandbox;
@@ -86,9 +86,9 @@ describe('adagio analytics adapter - adagio.js', () => {
       };
 
       const testEvents = {
-        [constants.EVENTS.BID_REQUESTED]: bidRequest,
-        [constants.EVENTS.BID_RESPONSE]: bidResponse,
-        [constants.EVENTS.AUCTION_END]: {}
+        [EVENTS.BID_REQUESTED]: bidRequest,
+        [EVENTS.BID_RESPONSE]: bidResponse,
+        [EVENTS.AUCTION_END]: {}
       };
 
       // Step 1-3: Send events
@@ -162,13 +162,13 @@ describe('adagio analytics adapter - adagio.js', () => {
       };
 
       // Step 1: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
+      events.emit(EVENTS.BID_REQUESTED, bidRequest);
 
       // Step 2: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+      events.emit(EVENTS.BID_RESPONSE, bidResponse);
 
       // Step 3: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(EVENTS.AUCTION_END, {});
 
       utils.getWindowTop.restore();
 
@@ -647,24 +647,26 @@ describe('adagio analytics adapter', () => {
     });
 
     it('builds and sends auction data', () => {
-      getGlobal().convertCurrency = (cpm, from, to) => {
-        const convKeys = {
-          'GBP-EUR': 0.7,
-          'EUR-GBP': 1.3,
-          'USD-EUR': 0.8,
-          'EUR-USD': 1.2,
-          'USD-GBP': 0.6,
-          'GBP-USD': 1.6,
-        };
-        return cpm * (convKeys[`${from}-${to}`] || 1);
-      };
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({
+        convertCurrency: (cpm, from, to) => {
+          const convKeys = {
+            'GBP-EUR': 0.7,
+            'EUR-GBP': 1.3,
+            'USD-EUR': 0.8,
+            'EUR-USD': 1.2,
+            'USD-GBP': 0.6,
+            'GBP-USD': 1.6,
+          };
+          return cpm * (convKeys[`${from}-${to}`] || 1);
+        }
+      });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
-      events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
-      events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
-      events.emit(constants.EVENTS.AUCTION_END, MOCK.AUCTION_END.another);
-      events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON.another);
-      events.emit(constants.EVENTS.AD_RENDER_SUCCEEDED, MOCK.AD_RENDER_SUCCEEDED.another);
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another);
+      events.emit(EVENTS.BID_WON, MOCK.BID_WON.another);
+      events.emit(EVENTS.AD_RENDER_SUCCEEDED, MOCK.AD_RENDER_SUCCEEDED.another);
 
       expect(server.requests.length).to.equal(3, 'requests count');
       {
@@ -697,6 +699,7 @@ describe('adagio analytics adapter', () => {
         expect(search.e_sid).to.equal('42');
         expect(search.e_pba_test).to.equal('true');
         expect(search.bdrs_bid).to.equal('1,1,0');
+        expect(search.bdrs_cpm).to.equal('1.42,2.052,');
       }
 
       {
@@ -710,35 +713,33 @@ describe('adagio analytics adapter', () => {
         expect(search.win_bdr).to.equal('another');
         expect(search.win_mt).to.equal('ban');
         expect(search.win_ban_sz).to.equal('728x90');
-        expect(search.win_cpm).to.equal('1.71');
-        expect(search.cur).to.equal('EUR');
-        expect(search.cur_rate).to.equal('1.2');
-        expect(search.og_cpm).to.equal('1.62');
-        expect(search.og_cur).to.equal('GBP');
-        expect(search.og_cur_rate).to.equal('1.6');
+        expect(search.win_net_cpm).to.equal('2.052');
+        expect(search.win_og_cpm).to.equal('2.592');
       }
     });
 
     it('builds and sends auction data with a cached bid win', () => {
-      getGlobal().convertCurrency = (cpm, from, to) => {
-        const convKeys = {
-          'GBP-EUR': 0.7,
-          'EUR-GBP': 1.3,
-          'USD-EUR': 0.8,
-          'EUR-USD': 1.2,
-          'USD-GBP': 0.6,
-          'GBP-USD': 1.6,
-        };
-        return cpm * (convKeys[`${from}-${to}`] || 1);
-      };
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({
+        convertCurrency: (cpm, from, to) => {
+          const convKeys = {
+            'GBP-EUR': 0.7,
+            'EUR-GBP': 1.3,
+            'USD-EUR': 0.8,
+            'EUR-USD': 1.2,
+            'USD-GBP': 0.6,
+            'GBP-USD': 1.6,
+          };
+          return cpm * (convKeys[`${from}-${to}`] || 1);
+        }
+      });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.bidcached);
-      events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
-      events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
-      events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
-      events.emit(constants.EVENTS.AUCTION_END, MOCK.AUCTION_END.another_nobid);
-      events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON.bidcached);
-      events.emit(constants.EVENTS.AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED.bidcached);
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.bidcached);
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another_nobid);
+      events.emit(EVENTS.BID_WON, MOCK.BID_WON.bidcached);
+      events.emit(EVENTS.AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED.bidcached);
 
       expect(server.requests.length).to.equal(5, 'requests count');
       {
@@ -794,6 +795,7 @@ describe('adagio analytics adapter', () => {
         expect(search.e_sid).to.equal('42');
         expect(search.e_pba_test).to.equal('true');
         expect(search.bdrs_bid).to.equal('0,0,0');
+        expect(search.bdrs_cpm).to.equal(',,');
       }
 
       {
@@ -808,12 +810,8 @@ describe('adagio analytics adapter', () => {
         expect(search.win_bdr).to.equal('adagio');
         expect(search.win_mt).to.equal('ban');
         expect(search.win_ban_sz).to.equal('728x90');
-        expect(search.win_cpm).to.equal('1.42');
-        expect(search.cur).to.equal('USD');
-        expect(search.cur_rate).to.equal('1');
-        expect(search.og_cpm).to.equal('1.42');
-        expect(search.og_cur).to.equal('USD');
-        expect(search.og_cur_rate).to.equal('1');
+        expect(search.win_net_cpm).to.equal('1.42');
+        expect(search.win_og_cpm).to.equal('1.42');
         expect(search.rndr).to.not.exist;
       }
 
@@ -829,5 +827,31 @@ describe('adagio analytics adapter', () => {
         expect(search.rndr).to.equal('0');
       }
     });
+
+    it('send an "empty" cpm when adserver currency != USD and convertCurrency() is undefined', () => {
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({});
+
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another);
+      events.emit(EVENTS.BID_WON, MOCK.BID_WON.another);
+      events.emit(EVENTS.AD_RENDER_SUCCEEDED, MOCK.AD_RENDER_SUCCEEDED.another);
+
+      expect(server.requests.length).to.equal(3, 'requests count');
+
+      // fail to compute bidder cpm and send an "empty" cpm
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[1].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('2');
+        expect(search.e_sid).to.equal('42');
+        expect(search.e_pba_test).to.equal('true');
+        expect(search.bdrs_bid).to.equal('1,1,0');
+        expect(search.bdrs_cpm).to.equal('1.42,,');
+      }
+    });
   });
 });

package/test/spec/modules/adkernelAdnAnalytics_spec.js

@@ -1,7 +1,7 @@
 import analyticsAdapter, {ExpiringQueue, getUmtSource, storage} from 'modules/adkernelAdnAnalyticsAdapter';
 import {expect} from 'chai';
 import adapterManager from 'src/adapterManager';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 
 const events = require('../../../src/events');
 
@@ -230,21 +230,21 @@ describe('', function () {
     });
 
     it('should handle auction init event', function () {
-      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {config: {}, bidderRequests: [REQUEST], timeout: 3000});
+      events.emit(EVENTS.AUCTION_INIT, {config: {}, bidderRequests: [REQUEST], timeout: 3000});
       const ev = analyticsAdapter.context.queue.peekAll();
       expect(ev).to.have.length(1);
       expect(ev[0]).to.be.eql({event: 'auctionInit'});
     });
 
     it('should handle bid request event', function () {
-      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, REQUEST);
+      events.emit(EVENTS.BID_REQUESTED, REQUEST);
       const ev = analyticsAdapter.context.queue.peekAll();
       expect(ev).to.have.length(2);
       expect(ev[1]).to.be.eql({event: 'bidRequested', adapter: 'adapter', tagid: 'container-1'});
     });
 
     it('should handle bid response event', function () {
-      events.emit(CONSTANTS.EVENTS.BID_RESPONSE, RESPONSE);
+      events.emit(EVENTS.BID_RESPONSE, RESPONSE);
       const ev = analyticsAdapter.context.queue.peekAll();
       expect(ev).to.have.length(3);
       expect(ev[2]).to.be.eql({
@@ -258,7 +258,7 @@ describe('', function () {
 
     it('should handle auction end event', function () {
       timer.tick(447);
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, RESPONSE);
+      events.emit(EVENTS.AUCTION_END, RESPONSE);
       let ev = analyticsAdapter.context.queue.peekAll();
       expect(ev).to.have.length(0);
       expect(ajaxStub.calledOnce).to.be.equal(true);
@@ -267,7 +267,7 @@ describe('', function () {
     });
 
     it('should handle winning bid', function () {
-      events.emit(CONSTANTS.EVENTS.BID_WON, RESPONSE);
+      events.emit(EVENTS.BID_WON, RESPONSE);
       timer.tick(4500);
       expect(ajaxStub.calledTwice).to.be.equal(true);
       let ev = JSON.parse(ajaxStub.secondCall.args[0]).hb_ev;

package/test/spec/modules/adkernelBidAdapter_spec.js

@@ -125,7 +125,8 @@ describe('Adkernel adapter', function () {
       bidId: 'Bid_01',
       bidderRequestId: 'req-001',
       auctionId: 'auc-001'
-    }, bid_native = {
+    },
+    bid_native = {
       bidder: 'adkernel',
       params: {zoneId: 1, host: 'rtb.adkernel.com'},
       mediaTypes: {
@@ -171,6 +172,33 @@ describe('Adkernel adapter', function () {
           }
         }
       },
+      nativeOrtbRequest: {
+        ver: '1.2',
+        assets: [
+          {
+            id: 0, required: 1, title: {len: 80}
+          }, {
+            id: 1, required: 1, data: {type: 2}},
+          {
+            id: 2, required: 1, data: {type: 10}
+          }, {
+            id: 3, required: 1, img: {type: 1, wmin: 50, hmin: 50}
+          }, {
+            id: 4, required: 1, img: {type: 3, w: 300, h: 200}
+          }, {
+            id: 5, required: 0, data: {type: 3}
+          }, {
+            id: 6, required: 0, data: {type: 6}
+          }, {
+            id: 7, required: 0, data: {type: 12}
+          }, {
+            id: 8, required: 0, data: {type: 1}
+          }, {
+            id: 9, required: 0, data: {type: 11}
+          }
+        ],
+        privacy: 1
+      },
       adUnitCode: 'ad-unit-1',
       transactionId: 'f82c64b8-c602-42a4-9791-4a268f6559ed',
       bidId: 'Bid_01',
@@ -190,7 +218,8 @@ describe('Adkernel adapter', function () {
           adm: '<!-- admarkup here -->',
           w: 300,
           h: 250,
-          dealid: 'deal'
+          dealid: 'deal',
+          mtype: 1
         }]
       }],
       ext: {
@@ -206,7 +235,8 @@ describe('Adkernel adapter', function () {
           price: 0.00145,
           adid: '158801',
           nurl: 'https://rtb.com/win?i=sZSYq5zYMxo_0&f=nurl',
-          cid: '16855'
+          cid: '16855',
+          mtype: 2
         }]
       }],
     }, usersyncOnlyResponse = {
@@ -241,6 +271,7 @@ describe('Adkernel adapter', function () {
           cat: ['IAB1-4', 'IAB8-16', 'IAB25-5'],
           cid: '1',
           crid: '4',
+          mtype: 4,
           ext: {
             'advertiser_id': 777,
             'advertiser_name': 'advertiser',
@@ -262,7 +293,8 @@ describe('Adkernel adapter', function () {
           adid: '158801',
           adm: '<!-- admarkup -->',
           nurl: 'https://rtb.com/win?i=sZSYq5zYMxo_0&f=nurl',
-          cid: '16855'
+          cid: '16855',
+          mtype: 1
         }, {
           id: 'sZSYq5zYMxo_1',
           impid: 'Bid_01v__mf',
@@ -270,7 +302,8 @@ describe('Adkernel adapter', function () {
           price: 0.25,
           adid: '158801',
           nurl: 'https://rtb.com/win?i=sZSYq5zYMxo_1&f=nurl',
-          cid: '16855'
+          cid: '16855',
+          mtype: 2
         }]
       }],
       bidid: 'pTuOlf5KHUo',
@@ -679,18 +712,18 @@ describe('Adkernel adapter', function () {
       expect(bidRequests[0].imp[0]).to.have.property('native');
       expect(bidRequests[0].imp[0].native).to.have.property('request');
       let request = JSON.parse(bidRequests[0].imp[0].native.request);
-      expect(request).to.have.property('ver', '1.1');
+      expect(request).to.have.property('ver', '1.2');
       expect(request.assets).to.have.length(10);
       expect(request.assets[0]).to.be.eql({id: 0, required: 1, title: {len: 80}});
-      expect(request.assets[1]).to.be.eql({id: 3, required: 1, data: {type: 2}});
-      expect(request.assets[2]).to.be.eql({id: 4, required: 1, data: {type: 10}});
-      expect(request.assets[3]).to.be.eql({id: 1, required: 1, img: {wmin: 50, hmin: 50, type: 1}});
-      expect(request.assets[4]).to.be.eql({id: 2, required: 1, img: {w: 300, h: 200, type: 3}});
-      expect(request.assets[5]).to.be.eql({id: 11, required: 0, data: {type: 3}});
-      expect(request.assets[6]).to.be.eql({id: 8, required: 0, data: {type: 6}});
-      expect(request.assets[7]).to.be.eql({id: 10, required: 0, data: {type: 12}});
-      expect(request.assets[8]).to.be.eql({id: 5, required: 0, data: {type: 1}});
-      expect(request.assets[9]).to.be.eql({id: 14, required: 0, data: {type: 11}});
+      expect(request.assets[1]).to.be.eql({id: 1, required: 1, data: {type: 2}});
+      expect(request.assets[2]).to.be.eql({id: 2, required: 1, data: {type: 10}});
+      expect(request.assets[3]).to.be.eql({id: 3, required: 1, img: {wmin: 50, hmin: 50, type: 1}});
+      expect(request.assets[4]).to.be.eql({id: 4, required: 1, img: {w: 300, h: 200, type: 3}});
+      expect(request.assets[5]).to.be.eql({id: 5, required: 0, data: {type: 3}});
+      expect(request.assets[6]).to.be.eql({id: 6, required: 0, data: {type: 6}});
+      expect(request.assets[7]).to.be.eql({id: 7, required: 0, data: {type: 12}});
+      expect(request.assets[8]).to.be.eql({id: 8, required: 0, data: {type: 1}});
+      expect(request.assets[9]).to.be.eql({id: 9, required: 0, data: {type: 11}});
     });
 
     it('native response processing', () => {
@@ -707,15 +740,21 @@ describe('Adkernel adapter', function () {
       expect(resp.meta.secondaryCatIds).to.be.eql(['IAB1-4', 'IAB8-16', 'IAB25-5']);
       expect(resp).to.have.property('mediaType', NATIVE);
       expect(resp).to.have.property('native');
-      expect(resp.native).to.have.property('clickUrl', 'http://rtb.com/click?i=pTuOlf5KHUo_0');
-      expect(resp.native.impressionTrackers).to.be.eql(['http://rtb.com/win?i=pTuOlf5KHUo_0&f=imp']);
-      expect(resp.native).to.have.property('title', 'Title');
-      expect(resp.native).to.have.property('body', 'Description');
-      expect(resp.native).to.have.property('body2', 'Additional description');
-      expect(resp.native.icon).to.be.eql({url: 'http://rtb.com/thumbnail?i=pTuOlf5KHUo_0&imgt=icon', width: 50, height: 50});
-      expect(resp.native.image).to.be.eql({url: 'http://rtb.com/thumbnail?i=pTuOlf5KHUo_0', width: 300, height: 200});
-      expect(resp.native).to.have.property('sponsoredBy', 'Sponsor.com');
-      expect(resp.native).to.have.property('displayUrl', 'displayurl.com');
+      expect(resp.native).to.have.property('ortb');
+
+      expect(resp.native.ortb).to.be.eql({
+        assets: [
+          {id: 0, title: {text: 'Title'}},
+          {id: 3, data: {value: 'Description'}},
+          {id: 4, data: {value: 'Additional description'}},
+          {id: 1, img: {url: 'http://rtb.com/thumbnail?i=pTuOlf5KHUo_0&imgt=icon', w: 50, h: 50}},
+          {id: 2, img: {url: 'http://rtb.com/thumbnail?i=pTuOlf5KHUo_0', w: 300, h: 200}},
+          {id: 5, data: {value: 'Sponsor.com'}},
+          {id: 14, data: {value: 'displayurl.com'}}
+        ],
+        link: {url: 'http://rtb.com/click?i=pTuOlf5KHUo_0'},
+        imptrackers: ['http://rtb.com/win?i=pTuOlf5KHUo_0&f=imp']
+      });
     });
   });
 });

package/test/spec/modules/adlooxAnalyticsAdapter_spec.js

@@ -3,7 +3,7 @@ import analyticsAdapter, { command as analyticsCommand, COMMAND } from 'modules/
 import { AUCTION_COMPLETED } from 'src/auction.js';
 import { expect } from 'chai';
 import * as events from 'src/events.js';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 import * as utils from 'src/utils.js';
 import { loadExternalScriptStub } from 'test/mocks/adloaderStub.js';
 
@@ -143,10 +143,10 @@ describe('Adloox Analytics Adapter', function () {
           return arg.tagName === 'LINK' && arg.getAttribute('rel') === 'preload' && arg.getAttribute('as') === 'script' && href_uri.href === uri.href;
         };
 
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, auctionDetails);
+        events.emit(EVENTS.AUCTION_END, auctionDetails);
         expect(insertElementStub.calledWith(sinon.match(isLinkPreloadAsScript))).to.true;
 
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, auctionDetails);
+        events.emit(EVENTS.AUCTION_END, auctionDetails);
         expect(insertElementStub.callCount).to.equal(1);
 
         done();
@@ -167,7 +167,7 @@ describe('Adloox Analytics Adapter', function () {
         const querySelectorStub = sandbox.stub(document, 'querySelector');
         querySelectorStub.withArgs(`#${bid.adUnitCode}`).returns(slot);
 
-        events.emit(CONSTANTS.EVENTS.BID_WON, bid);
+        events.emit(EVENTS.BID_WON, bid);
 
         const [urlInserted, moduleCode] = loadExternalScriptStub.getCall(0).args;
 
@@ -196,7 +196,7 @@ describe('Adloox Analytics Adapter', function () {
         const querySelectorStub = sandbox.stub(document, 'querySelector');
         querySelectorStub.withArgs(`#${bid.adUnitCode}`).returns(slot);
 
-        events.emit(CONSTANTS.EVENTS.BID_WON, bidIgnore);
+        events.emit(EVENTS.BID_WON, bidIgnore);
 
         expect(parent.querySelector('script')).is.null;
 
@@ -238,7 +238,7 @@ describe('Adloox Analytics Adapter', function () {
 
       it('should inject tracking event', function (done) {
         const data = {
-          eventType: CONSTANTS.EVENTS.BID_WON,
+          eventType: EVENTS.BID_WON,
           args: bid
         };
 

package/test/spec/modules/adnuntiusBidAdapter_spec.js

@@ -12,7 +12,7 @@ describe('adnuntiusBidAdapter', function() {
   const EURO_URL = 'https://europe.delivery.adnuntius.com/i?tzo=';
   const usi = utils.generateUUID()
 
-  const meta = [{key: 'valueless'}, {value: 'keyless'}, {key: 'voidAuIds'}, {key: 'voidAuIds', value: [{auId: '11118b6bc', exp: misc.getUnixTimestamp()}, {exp: misc.getUnixTimestamp(1)}]}, {key: 'valid', value: 'also-valid', exp: misc.getUnixTimestamp(1)}, {key: 'expired', value: 'fwefew', exp: misc.getUnixTimestamp()}, {key: 'usi', value: 'should be skipped because timestamp', exp: misc.getUnixTimestamp()}, {key: 'usi', value: usi, exp: misc.getUnixTimestamp(100)}, {key: 'usi', value: 'should be skipped because timestamp', exp: misc.getUnixTimestamp()}]
+  const meta = [{key: 'valueless'}, {value: 'keyless'}, {key: 'voidAuIds'}, {key: 'voidAuIds', value: [{auId: '11118b6bc', exp: misc.getUnixTimestamp()}, {exp: misc.getUnixTimestamp(1)}]}, {key: 'valid-withnetwork', value: 'also-valid-network', network: 'the-network', exp: misc.getUnixTimestamp(1)}, {key: 'valid', value: 'also-valid', exp: misc.getUnixTimestamp(1)}, {key: 'expired', value: 'fwefew', exp: misc.getUnixTimestamp()}, {key: 'usi', value: 'should be skipped because timestamp', exp: misc.getUnixTimestamp(), network: 'adnuntius'}, {key: 'usi', value: usi, exp: misc.getUnixTimestamp(100), network: 'adnuntius'}, {key: 'usi', value: 'should be skipped because timestamp', exp: misc.getUnixTimestamp()}]
   let storage;
 
   before(() => {
@@ -37,12 +37,12 @@ describe('adnuntiusBidAdapter', function() {
   });
 
   const tzo = new Date().getTimezoneOffset();
-  const ENDPOINT_URL_BASE = `${URL}${tzo}&format=json`;
+  const ENDPOINT_URL_BASE = `${URL}${tzo}&format=prebid`;
   const ENDPOINT_URL = `${ENDPOINT_URL_BASE}&userId=${usi}`;
   const ENDPOINT_URL_VIDEO = `${ENDPOINT_URL_BASE}&userId=${usi}&tt=vast4`;
   const ENDPOINT_URL_NOCOOKIE = `${ENDPOINT_URL_BASE}&userId=${usi}&noCookies=true`;
   const ENDPOINT_URL_SEGMENTS = `${ENDPOINT_URL_BASE}&segments=segment1,segment2,segment3&userId=${usi}`;
-  const ENDPOINT_URL_CONSENT = `${EURO_URL}${tzo}&format=json&consentString=consentString&gdpr=1&userId=${usi}`;
+  const ENDPOINT_URL_CONSENT = `${EURO_URL}${tzo}&format=prebid&consentString=consentString&gdpr=1&userId=${usi}`;
   const adapter = newBidder(spec);
 
   const bidderRequests = [
@@ -257,7 +257,8 @@ describe('adnuntiusBidAdapter', function() {
         'usi': 'from-api-server dude',
         'voidAuIds': '00000000000abcde;00000000000fffff',
         'randomApiKey': 'randomApiValue'
-      }
+      },
+      'network': 'some-network-id'
     }
   }
   const serverVideoResponse = {
@@ -464,7 +465,7 @@ describe('adnuntiusBidAdapter', function() {
       expect(request[0]).to.have.property('url');
       expect(request[0].url).to.equal(ENDPOINT_URL);
       expect(request[0]).to.have.property('data');
-      expect(request[0].data).to.equal('{"adUnits":[{"auId":"000000000008b6bc","targetId":"123","maxDeals":1,"dimensions":[[640,480],[600,400]]},{"auId":"0000000000000551","targetId":"adn-0000000000000551","dimensions":[[1640,1480],[1600,1400]]}],"metaData":{"valid":"also-valid"}}');
+      expect(request[0].data).to.equal('{"adUnits":[{"auId":"000000000008b6bc","targetId":"123","maxDeals":1,"dimensions":[[640,480],[600,400]]},{"auId":"0000000000000551","targetId":"adn-0000000000000551","dimensions":[[1640,1480],[1600,1400]]}]}');
     });
 
     it('Test requests with no local storage', function() {
@@ -695,7 +696,7 @@ describe('adnuntiusBidAdapter', function() {
             network: 'adnuntius'
           }
         }
-      ]
+      ];
       const request = config.runWithBidder('adnuntius', () => spec.buildRequests(req, { bids: req }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
@@ -913,10 +914,11 @@ describe('adnuntiusBidAdapter', function() {
       expect(interpretedResponse[1].dealCount).to.equal(0);
 
       const results = JSON.parse(storage.getDataFromLocalStorage('adn.metaData'));
-      const usiEntry = results.find(entry => entry.key === 'usi');
+      const usiEntry = results.find(entry => entry.key === 'usi' && entry.network === 'some-network-id');
       expect(usiEntry.key).to.equal('usi');
       expect(usiEntry.value).to.equal('from-api-server dude');
       expect(usiEntry.exp).to.be.greaterThan(misc.getUnixTimestamp(90));
+      expect(usiEntry.network).to.equal('some-network-id')
 
       const voidAuIdsEntry = results.find(entry => entry.key === 'voidAuIds');
       expect(voidAuIdsEntry.key).to.equal('voidAuIds');
@@ -937,6 +939,7 @@ describe('adnuntiusBidAdapter', function() {
       const randomApiEntry = results.find(entry => entry.key === 'randomApiKey');
       expect(randomApiEntry.key).to.equal('randomApiKey');
       expect(randomApiEntry.value).to.equal('randomApiValue');
+      expect(randomApiEntry.network).to.equal('some-network-id');
       expect(randomApiEntry.exp).to.be.greaterThan(misc.getUnixTimestamp(90));
     });
 

package/test/spec/modules/adomikAnalyticsAdapter_spec.js

@@ -1,9 +1,9 @@
 import adomikAnalytics from 'modules/adomikAnalyticsAdapter.js';
 import { expect } from 'chai';
+import {EVENTS} from 'src/constants.js';
 
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
-let constants = require('src/constants.json');
 
 describe('Adomik Prebid Analytic', function () {
   let sendEventStub;
@@ -70,7 +70,7 @@ describe('Adomik Prebid Analytic', function () {
       });
 
       // Step 2: Send init auction event
-      events.emit(constants.EVENTS.AUCTION_INIT, {config: initOptions, auctionId: 'test-test-test'});
+      events.emit(EVENTS.AUCTION_INIT, {config: initOptions, auctionId: 'test-test-test'});
 
       expect(adomikAnalytics.currentContext).to.deep.equal({
         uid: '123456',
@@ -81,7 +81,7 @@ describe('Adomik Prebid Analytic', function () {
       });
 
       // Step 3: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, { bids: [bid] });
+      events.emit(EVENTS.BID_REQUESTED, { bids: [bid] });
 
       expect(adomikAnalytics.bucketEvents.length).to.equal(1);
       expect(adomikAnalytics.bucketEvents[0]).to.deep.equal({
@@ -93,7 +93,7 @@ describe('Adomik Prebid Analytic', function () {
       });
 
       // Step 4: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bid);
+      events.emit(EVENTS.BID_RESPONSE, bid);
 
       expect(adomikAnalytics.bucketEvents.length).to.equal(2);
       expect(adomikAnalytics.bucketEvents[1]).to.deep.equal({
@@ -114,17 +114,17 @@ describe('Adomik Prebid Analytic', function () {
       });
 
       // Step 5: Send bid won event
-      events.emit(constants.EVENTS.BID_WON, bid);
+      events.emit(EVENTS.BID_WON, bid);
 
       expect(adomikAnalytics.bucketEvents.length).to.equal(2);
 
       // Step 6: Send bid timeout event
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
+      events.emit(EVENTS.BID_TIMEOUT, {});
 
       expect(adomikAnalytics.currentContext.timeouted).to.equal(true);
 
       // Step 7: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(EVENTS.AUCTION_END, {});
 
       setTimeout(function() {
         sinon.assert.callCount(sendEventStub, 1);

package/test/spec/modules/adxcgAnalyticsAdapter_spec.js

@@ -2,9 +2,9 @@ import adxcgAnalyticsAdapter from 'modules/adxcgAnalyticsAdapter.js';
 import { expect } from 'chai';
 import adapterManager from 'src/adapterManager.js';
 import { server } from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
 
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('adxcg analytics adapter', function () {
   beforeEach(function () {
@@ -171,21 +171,21 @@ describe('adxcg analytics adapter', function () {
 
     it('builds and sends auction data', function () {
       // Step 1: Send auction init event
-      events.emit(constants.EVENTS.AUCTION_INIT, {
+      events.emit(EVENTS.AUCTION_INIT, {
         timestamp: auctionTimestamp
       });
 
       // Step 2: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
+      events.emit(EVENTS.BID_REQUESTED, bidRequest);
 
       // Step 3: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+      events.emit(EVENTS.BID_RESPONSE, bidResponse);
 
       // Step 4: Send bid time out event
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeoutArgsV1);
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeoutArgsV1);
 
       // Step 5: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(EVENTS.AUCTION_END, {});
 
       expect(server.requests.length).to.equal(1);
 
@@ -196,7 +196,7 @@ describe('adxcg analytics adapter', function () {
       expect(realAfterBid.bidTimeout).to.deep.equal(['bidderOne', 'bidderTwo']);
 
       // Step 6: Send auction bid won event
-      events.emit(constants.EVENTS.BID_WON, wonRequest);
+      events.emit(EVENTS.BID_WON, wonRequest);
 
       expect(server.requests.length).to.equal(2);
       let winEventData = JSON.parse(server.requests[1].requestBody);