prebid.js 7.53.0 → 8.0.0

package/test/spec/modules/prebidServerBidAdapter_spec.js

@@ -26,6 +26,7 @@ import 'modules/consentManagement.js';
 import 'modules/consentManagementUsp.js';
 import 'modules/schain.js';
 import 'modules/fledgeForGpt.js';
+import * as redactor from 'src/activities/redactor.js';
 import {hook} from '../../../src/hook.js';
 import {decorateAdUnitsWithNativeParams} from '../../../src/native.js';
 import {auctionManager} from '../../../src/auctionManager.js';
@@ -636,16 +637,103 @@ describe('S2S Adapter', function () {
       resetSyncedStatus();
     });
 
-    it('should set id and source.tid to auction ID', function () {
-      config.setConfig({ s2sConfig: CONFIG });
+    describe('FPD redaction', () => {
+      let sandbox, ortb2Fragments, redactorMocks, s2sReq;
 
-      adapter.callBids(OUTSTREAM_VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      beforeEach(() => {
+        sandbox = sinon.sandbox.create();
+        redactorMocks = {};
+        sandbox.stub(redactor, 'redactor').callsFake((params) => {
+          if (!redactorMocks.hasOwnProperty(params.component)) {
+            redactorMocks[params.component] = {
+              ortb2: sinon.stub().callsFake(o => o),
+              bidRequest: sinon.stub().callsFake(o => o)
+            }
+          }
+          return redactorMocks[params.component];
+        })
+        ortb2Fragments = {
+          global: {
+            mock: 'value'
+          },
+          bidder: {
+            appnexus: {
+              mock: 'A'
+            }
+          }
+        }
+        const s2sConfig = {
+          ...CONFIG,
+        };
+        config.setConfig({s2sConfig});
+        s2sReq = {
+          ...REQUEST,
+          s2sConfig
+        };
+      });
 
-      const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.id).to.equal(BID_REQUESTS[0].auctionId);
-      expect(requestBid.source.tid).to.equal(BID_REQUESTS[0].auctionId);
+      afterEach(() => {
+        sandbox.restore();
+      })
+
+      function callBids() {
+        adapter.callBids({
+          ...s2sReq,
+          ortb2Fragments
+        }, BID_REQUESTS, addBidResponse, done, ajax);
+      }
+
+      it('should be applied to ortb2Fragments', () => {
+        callBids();
+        sinon.assert.calledWithMatch(redactorMocks['prebid.pbsBidAdapter'].ortb2, ortb2Fragments.global);
+        Object.entries(ortb2Fragments.bidder).forEach(([bidder, ortb2]) => {
+          sinon.assert.calledWith(redactorMocks[`bidder.${bidder}`].ortb2, ortb2);
+        });
+      });
+
+      it('should be applied to ad units', () => {
+        callBids();
+        s2sReq.ad_units.forEach(au => {
+          sinon.assert.calledWith(redactorMocks['prebid.pbsBidAdapter'].bidRequest, au);
+          au.bids.forEach((bid) => {
+            sinon.assert.calledWith(redactorMocks[`bidder.${bid.bidder}`].bidRequest, bid);
+          })
+        })
+      })
     });
 
+    describe('transaction IDs', () => {
+      let s2sReq;
+      beforeEach(() => {
+        s2sReq = {
+          ...REQUEST,
+          ortb2Fragments: {global: {source: {tid: 'mock-tid'}}},
+          ad_units: REQUEST.ad_units.map(au => ({...au, ortb2Imp: {ext: {tid: 'mock-tid'}}}))
+        };
+        BID_REQUESTS[0].bids[0].ortb2Imp = {ext: {tid: 'mock-tid'}};
+      });
+
+      function makeRequest() {
+        adapter.callBids(s2sReq, BID_REQUESTS, addBidResponse, done, ajax);
+        return JSON.parse(server.requests[0].requestBody);
+      }
+
+      it('should not be set when transmitTid is not allowed, with ext.prebid.createtids: false', () => {
+        config.setConfig({ s2sConfig: CONFIG, enableTIDs: false });
+        const req = makeRequest();
+        expect(req.source.tid).to.not.exist;
+        expect(req.imp[0].ext.tid).to.not.exist;
+        expect(req.ext.prebid.createtids).to.equal(false);
+      });
+
+      it('should be picked from FPD otherwise', () => {
+        config.setConfig({s2sConfig: CONFIG, enableTIDs: true});
+        const req = makeRequest();
+        expect(req.source.tid).to.eql('mock-tid');
+        expect(req.imp[0].ext.tid).to.eql('mock-tid');
+      })
+    })
+
     it('should set tmax to s2sConfig.timeout', () => {
       const cfg = {...CONFIG, timeout: 123};
       config.setConfig({s2sConfig: cfg});
@@ -1405,11 +1493,9 @@ describe('S2S Adapter', function () {
           const ortbReq = JSON.parse(requestBid.imp[0].native.request);
           expect(ortbReq).to.deep.equal({
             ...ORTB_NATIVE_REQ,
-            'context': 1,
-            'plcmttype': 1,
             'eventtrackers': [{
               event: 1,
-              methods: [1]
+              methods: [1, 2]
             }],
           });
           expect(requestBid.imp[0].native.ver).to.equal('1.2');
@@ -1643,19 +1729,17 @@ describe('S2S Adapter', function () {
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
-      expect(requestBid.ext).to.deep.equal({
-        prebid: {
-          auctiontimestamp: 1510852447530,
-          targeting: {
-            includebidderkeys: false,
-            includewinners: true
-          },
-          channel: {
-            name: 'pbjs',
-            version: 'v$prebid.version$'
-          }
+      sinon.assert.match(requestBid.ext.prebid, {
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
+        },
+        channel: {
+          name: 'pbjs',
+          version: 'v$prebid.version$'
         }
-      });
+      })
     });
 
     it('skips dynamic aliases to request when skipPbsAliasing enabled', function () {
@@ -1682,17 +1766,15 @@ describe('S2S Adapter', function () {
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
-      expect(requestBid.ext).to.deep.equal({
-        prebid: {
-          auctiontimestamp: 1510852447530,
-          targeting: {
-            includebidderkeys: false,
-            includewinners: true
-          },
-          channel: {
-            name: 'pbjs',
-            version: 'v$prebid.version$'
-          }
+      sinon.assert.match(requestBid.ext.prebid, {
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
+        },
+        channel: {
+          name: 'pbjs',
+          version: 'v$prebid.version$'
         }
       });
     });

package/test/spec/modules/priceFloors_spec.js

@@ -286,7 +286,7 @@ describe('the price floors module', function () {
       let myBidRequest = { ...basicBidRequest };
 
       // should take adunit floormin first even if lower
-      utils.deepSetValue(myBidRequest, 'ortb2Imp.ext.prebid.floorMin', 2.2);
+      utils.deepSetValue(myBidRequest, 'ortb2Imp.ext.prebid.floors.floorMin', 2.2);
       expect(getFirstMatchingFloor(inputFloorData, myBidRequest, { mediaType: 'banner', size: '*' })).to.deep.equal({
         floorMin: 2.2,
         floorRuleValue: 1.0,
@@ -297,7 +297,7 @@ describe('the price floors module', function () {
       delete inputFloorData.matchingInputs;
 
       // should take adunit floormin if higher
-      utils.deepSetValue(myBidRequest, 'ortb2Imp.ext.prebid.floorMin', 3.0);
+      utils.deepSetValue(myBidRequest, 'ortb2Imp.ext.prebid.floors.floorMin', 3.0);
       expect(getFirstMatchingFloor(inputFloorData, myBidRequest, { mediaType: 'banner', size: '*' })).to.deep.equal({
         floorMin: 3.0,
         floorRuleValue: 1.0,
@@ -582,7 +582,7 @@ describe('the price floors module', function () {
     const validateBidRequests = (getFloorExpected, FloorDataExpected) => {
       exposedAdUnits.forEach(adUnit => adUnit.bids.forEach(bid => {
         expect(bid.hasOwnProperty('getFloor')).to.equal(getFloorExpected);
-        expect(bid.floorData).to.deep.equal(FloorDataExpected);
+        sinon.assert.match(bid.floorData, FloorDataExpected);
       }));
     };
     const runStandardAuction = (adUnits = [getAdUnitMock('test_div_1')]) => {
@@ -918,16 +918,8 @@ describe('the price floors module', function () {
         floorProvider: 'floorprovider'
       });
     });
-    it('should not overwrite previous data object if the new one is bad', function () {
+    it('should ignore and reset floor data when provided with invalid data', function () {
       handleSetFloorsConfig({...basicFloorConfig});
-      handleSetFloorsConfig({
-        ...basicFloorConfig,
-        data: undefined
-      });
-      handleSetFloorsConfig({
-        ...basicFloorConfig,
-        data: 5
-      });
       handleSetFloorsConfig({
         ...basicFloorConfig,
         data: {
@@ -937,17 +929,7 @@ describe('the price floors module', function () {
         }
       });
       runStandardAuction();
-      validateBidRequests(true, {
-        skipped: false,
-        floorMin: undefined,
-        modelVersion: 'basic model',
-        modelWeight: 10,
-        modelTimestamp: 1606772895,
-        location: 'setConfig',
-        skipRate: 0,
-        fetchStatus: undefined,
-        floorProvider: undefined
-      });
+      validateBidRequests(false, sinon.match({location: 'noData', skipped: true}));
     });
     it('should dynamically add new schema fileds and functions if added via setConfig', function () {
       let deviceSpoof;
@@ -1835,7 +1817,7 @@ describe('the price floors module', function () {
       transactionId: 'au',
     };
     beforeEach(function () {
-      returnedBidResponse = {};
+      returnedBidResponse = null;
       reject = sinon.stub().returns({status: 'rejected'});
       indexStub = sinon.stub(auctionManager, 'index');
       indexStub.get(() => stubAuctionIndex({adUnits: [adUnit]}));
@@ -1867,7 +1849,7 @@ describe('the price floors module', function () {
       _floorDataForAuction[AUCTION_ID].data.values = { 'banner': 1.0 };
       runBidResponse();
       expect(reject.calledOnce).to.be.true;
-      expect(returnedBidResponse.status).to.equal('rejected');
+      expect(returnedBidResponse).to.not.exist;
     });
     it('if it finds a rule and does not floor should update the bid accordingly', function () {
       _floorDataForAuction[AUCTION_ID] = utils.deepClone(basicFloorConfig);

package/test/spec/modules/pubgeniusBidAdapter_spec.js

@@ -5,6 +5,7 @@ import { config } from 'src/config.js';
 import { VIDEO } from 'src/mediaTypes.js';
 import { deepClone, parseQueryStringParameters } from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
+import * as utils from 'src/utils.js';
 
 const {
   code,
@@ -175,7 +176,7 @@ describe('pubGENIUS adapter', () => {
         method: 'POST',
         url: 'https://auction.adpearl.io/prebid/auction',
         data: {
-          id: 'fake-auction-id',
+          id: 'fakebidderrequestid',
           imp: [
             {
               id: 'fakebidid',

package/test/spec/modules/pubmaticAnalyticsAdapter_spec.js

@@ -443,6 +443,13 @@ describe('pubmatic analytics adapter', function () {
       expect(data.eg).to.equal('1.23');
       expect(data.en).to.equal('1.23');
       expect(data.piid).to.equal('partnerImpressionID-1');
+      expect(data.plt).to.equal('1');
+      expect(data.psz).to.equal('640x480');
+      expect(data.tgid).to.equal('15');
+      expect(data.orig).to.equal('www.test.com');
+      expect(data.ss).to.equal('1');
+      expect(data.fskp).to.equal('0');
+      expect(data.af).to.equal('video');
     });
 
     it('bidCpmAdjustment: USD: Logger: best case + win tracker', function() {

package/test/spec/modules/pubmaticBidAdapter_spec.js

@@ -79,7 +79,11 @@ describe('PubMatic adapter', function () {
         bidId: '23acc48ad47af5',
         requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
         bidderRequestId: '1c56ad30b9b8ca8',
-        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+        ortb2Imp: {
+          ext: {
+            tid: '92489f71-1bf2-49a0-adf9-000cea934729',
+          }
+        },
         schain: schainConfig
       }
     ];
@@ -1125,7 +1129,12 @@ describe('PubMatic adapter', function () {
 
   		it('Request params check', function () {
         let request = spec.buildRequests(bidRequests, {
-          auctionId: 'new-auction-id'
+          auctionId: 'new-auction-id',
+          ortb2: {
+            source: {
+              tid: 'source-tid'
+            }
+          }
         });
         let data = JSON.parse(request.data);
   		  expect(data.at).to.equal(1); // auction type
@@ -1135,13 +1144,13 @@ describe('PubMatic adapter', function () {
   		  expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
   		  expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
   		  expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
-  		  expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-  		  expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
-  		  expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-  		  expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+  		  expect(data.device.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+  		  expect(data.device.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+  		  expect(data.user.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+  		  expect(data.user.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
   		  expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
-  		  expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
-        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+  		  expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].ortb2Imp.ext.tid); // Prebid TransactionId
+        expect(data.source.tid).to.equal('source-tid'); // Prebid TransactionId
   		  expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
   		  expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
   		  expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
@@ -1388,12 +1397,12 @@ describe('PubMatic adapter', function () {
         expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
         expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
         expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
-        expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
-        expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+        expect(data.device.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+        expect(data.device.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+        expect(data.user.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+        expect(data.user.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
         expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
-        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].ortb2Imp.ext.tid); // Prebid TransactionId
         expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
         expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
         expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
@@ -1599,12 +1608,12 @@ describe('PubMatic adapter', function () {
         expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
         expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
         expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
-        expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
-        expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+        expect(data.device.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+        expect(data.device.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Longitude
+        expect(data.user.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+        expect(data.user.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Longitude
         expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
-        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].ortb2Imp.ext.tid); // Prebid TransactionId
         expect(data.ext.wrapper.wiid).to.equal('new-auction-id'); // OpenWrap: Wrapper Impression ID
         expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
         expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
@@ -1635,12 +1644,12 @@ describe('PubMatic adapter', function () {
   		  expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
   		  expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
   		  expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
-  		  expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-  		  expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
-  		  expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-  		  expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+  		  expect(data.device.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+  		  expect(data.device.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+  		  expect(data.user.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+  		  expect(data.user.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
   		  expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
-  		  expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+  		  expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].ortb2Imp.ext.tid); // Prebid TransactionId
   		  expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
         expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
   		  expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
@@ -1667,12 +1676,12 @@ describe('PubMatic adapter', function () {
         expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
         expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
         expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
-        expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
-        expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+        expect(data.device.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+        expect(data.device.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+        expect(data.user.geo.lat).to.not.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+        expect(data.user.geo.lon).to.not.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
         expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
-        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].ortb2Imp.ext.tid); // Prebid TransactionId
         expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
         expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
         expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
@@ -2697,10 +2706,10 @@ describe('PubMatic adapter', function () {
           expect(data.site.publisher.id).to.equal(multipleMediaRequests[0].params.publisherId); // publisher Id
           expect(data.user.yob).to.equal(parseInt(multipleMediaRequests[0].params.yob)); // YOB
           expect(data.user.gender).to.equal(multipleMediaRequests[0].params.gender); // Gender
-          expect(data.device.geo.lat).to.equal(parseFloat(multipleMediaRequests[0].params.lat)); // Latitude
-          expect(data.device.geo.lon).to.equal(parseFloat(multipleMediaRequests[0].params.lon)); // Lognitude
-          expect(data.user.geo.lat).to.equal(parseFloat(multipleMediaRequests[0].params.lat)); // Latitude
-          expect(data.user.geo.lon).to.equal(parseFloat(multipleMediaRequests[0].params.lon)); // Lognitude
+          expect(data.device.geo.lat).to.not.equal(parseFloat(multipleMediaRequests[0].params.lat)); // Latitude
+          expect(data.device.geo.lon).to.not.equal(parseFloat(multipleMediaRequests[0].params.lon)); // Lognitude
+          expect(data.user.geo.lat).to.not.equal(parseFloat(multipleMediaRequests[0].params.lat)); // Latitude
+          expect(data.user.geo.lon).to.not.equal(parseFloat(multipleMediaRequests[0].params.lon)); // Lognitude
           expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
           expect(data.ext.wrapper.transactionId).to.equal(multipleMediaRequests[0].transactionId); // Prebid TransactionId
           expect(data.ext.wrapper.wiid).to.equal(multipleMediaRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID

package/test/spec/modules/pubwiseBidAdapter_spec.js

@@ -101,6 +101,7 @@ const sampleValidBannerBidRequest = {
   },
   ortb2Imp: {
     ext: {
+      tid: '2001a8b2-3bcf-417d-b64f-92641dae21e0',
       data: {
         adserver: {
           name: 'gam',
@@ -125,7 +126,6 @@ const sampleValidBannerBidRequest = {
     }
   },
   'adUnitCode': 'div-gpt-ad-1460505748561-0',
-  'transactionId': '2001a8b2-3bcf-417d-b64f-92641dae21e0',
   'sizes': [
     [
       300,
@@ -179,6 +179,7 @@ const sampleValidBidRequests = [
     },
     ortb2Imp: {
       ext: {
+        tid: '2c8cd034-f068-4419-8c30-f07292c0d17b',
         data: {
           adserver: {
             name: 'gam',
@@ -213,7 +214,6 @@ const sampleValidBidRequests = [
       }
     },
     'adUnitCode': 'div-gpt-ad-1460505748561-1',
-    'transactionId': '2c8cd034-f068-4419-8c30-f07292c0d17b',
     'sizes': [],
     'bidId': '30ab7516a51a7c',
     'bidderRequestId': '18a45bff5ff705',
@@ -252,6 +252,7 @@ const sampleBidderBannerRequest = {
   },
   ortb2Imp: {
     ext: {
+      tid: '2001a8b2-3bcf-417d-b64f-92641dae21e0',
       data: {
         adserver: {
           name: 'gam',
@@ -272,7 +273,6 @@ const sampleBidderBannerRequest = {
     }
   },
   'adUnitCode': 'div-gpt-ad-1460505748561-0',
-  'transactionId': '2001a8b2-3bcf-417d-b64f-92641dae21e0',
   'sizes': [
     [
       300,
@@ -299,7 +299,11 @@ const sampleBidderBannerRequest = {
 
 const sampleBidderRequest = {
   'bidderCode': 'pubwise',
-  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  ortb2: {
+    source: {
+      tid: '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+    }
+  },
   'bidderRequestId': '18a45bff5ff705',
   'bids': [
     sampleBidderBannerRequest,
@@ -564,8 +568,8 @@ describe('PubWiseAdapter', function () {
     it('should handle complex bidRequest', function() {
       let request = spec.buildRequests(sampleValidBidRequests, sampleBidderRequest);
       expect(request.bidderRequest).to.equal(sampleBidderRequest, "Bid Request Doesn't Match Sample");
-      expect(request.data.source.tid).to.equal(sampleBidderRequest.auctionId, 'AuctionId -> source.tid Mismatch');
-      expect(request.data.imp[0].ext.tid).to.equal(sampleBidderRequest.bids[0].transactionId, 'TransactionId -> ext.tid Mismatch');
+      expect(request.data.source.tid).to.equal(sampleBidderRequest.ortb2.source.tid, 'source.tid -> source.tid Mismatch');
+      expect(request.data.imp[0].ext.tid).to.equal(sampleBidderRequest.bids[0].ortb2Imp.ext.tid, 'ext.tid -> ext.tid Mismatch');
     });
     it('must conform to API for buildRequests', function() {
       let request = spec.buildRequests(sampleValidBidRequests);

package/test/spec/modules/relaidoBidAdapter_spec.js

@@ -39,7 +39,11 @@ describe('RelaidoAdapter', function () {
       bidId: '2ed93003f7bb99',
       bidderRequestId: '1c50443387a1f2',
       auctionId: '413ed000-8c7a-4ba1-a1fa-9732e006f8c3',
-      transactionId: '5c2d064c-7b76-42e8-a383-983603afdc45',
+      ortb2Imp: {
+        ext: {
+          tid: '5c2d064c-7b76-42e8-a383-983603afdc45',
+        }
+      },
       bidRequestsCount: 1,
       bidderRequestsCount: 1,
       bidderWinsCount: 0
@@ -243,7 +247,7 @@ describe('RelaidoAdapter', function () {
       expect(request.bidder_request_id).to.equal(bidRequest.bidderRequestId);
       expect(data.bid_requests_count).to.equal(bidRequest.bidRequestsCount);
       expect(request.bid_id).to.equal(bidRequest.bidId);
-      expect(request.transaction_id).to.equal(bidRequest.transactionId);
+      expect(request.transaction_id).to.equal(bidRequest.ortb2Imp.ext.tid);
       expect(request.media_type).to.equal('video');
       expect(data.uuid).to.equal(relaido_uuid);
       expect(data.pv).to.equal('$prebid.version$');

package/test/spec/modules/revcontentBidAdapter_spec.js

@@ -266,8 +266,6 @@ describe('revcontent adapter', function () {
     it('should set correct native params', function () {
       const result = spec.interpretResponse(serverResponse, bidRequest)[0];
 
-      assert.equal(result.bidder, 'revcontent');
-      assert.equal(result.bidderCode, 'revcontent');
       assert.equal(result.mediaType, 'native');
       assert.equal(result.requestId, '294a7f446202848');
       assert.equal(result.cpm, '0.1');
@@ -279,8 +277,6 @@ describe('revcontent adapter', function () {
       bidRequest.bid[0].params.size.height = 90;
 
       const result = spec.interpretResponse(serverResponse, bidRequest)[0];
-      assert.equal(result.bidder, 'revcontent');
-      assert.equal(result.bidderCode, 'revcontent');
       assert.equal(result.mediaType, 'native');
       assert.equal(result.requestId, '294a7f446202848');
       assert.equal(result.cpm, '0.1');
@@ -292,8 +288,6 @@ describe('revcontent adapter', function () {
       bidRequest.bid[0].params.size.height = 600;
 
       const result = spec.interpretResponse(serverResponse, bidRequest)[0];
-      assert.equal(result.bidder, 'revcontent');
-      assert.equal(result.bidderCode, 'revcontent');
       assert.equal(result.mediaType, 'native');
       assert.equal(result.requestId, '294a7f446202848');
       assert.equal(result.cpm, '0.1');
@@ -304,8 +298,6 @@ describe('revcontent adapter', function () {
       bidRequest.bid[0].params.template = '<a href="{clickUrl}" rel="nofollow sponsored"  target="_blank" style="    border: 1px solid #eee;    width: 298px;    height: 248px;    display: block;"><div style="background-image:url({image});width: 300px;height: 165px;background-repeat: none;background-size: cover;"><div style="position: absolute;top: 160px;left:12px"><h1 style="color: #000;font-family: Arial, sans-serif;font-size: 19px; position: relative; width: 290px;">{title}</h1> <div style="border:1px solid #000;text-align:center;width:94%;font-family:Verdana;font-size:12px;color:#000">SEE MORE</div></div></div></a>';
 
       const result = spec.interpretResponse(serverResponse, bidRequest)[0];
-      assert.equal(result.bidder, 'revcontent');
-      assert.equal(result.bidderCode, 'revcontent');
       assert.equal(result.mediaType, 'native');
       assert.equal(result.requestId, '294a7f446202848');
       assert.equal(result.cpm, '0.1');
@@ -317,8 +309,6 @@ describe('revcontent adapter', function () {
       bidRequest.bid[0].params.size.height = 200;
 
       const result = spec.interpretResponse(serverResponse, bidRequest)[0];
-      assert.equal(result.bidder, 'revcontent');
-      assert.equal(result.bidderCode, 'revcontent');
       assert.equal(result.mediaType, 'native');
       assert.equal(result.requestId, '294a7f446202848');
       assert.equal(result.cpm, '0.1');

package/test/spec/modules/richaudienceBidAdapter_spec.js

@@ -25,7 +25,11 @@ describe('Richaudience adapter tests', function () {
     auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
     bidRequestsCount: 1,
     bidderRequestId: '1858b7382993ca',
-    transactionId: '29df2112-348b-4961-8863-1b33684d95e6',
+    ortb2Imp: {
+      ext: {
+        tid: '29df2112-348b-4961-8863-1b33684d95e6',
+      }
+    },
     user: {}
   }];