Merge branch 'master' into prebid-7

prebid · May 25, 2022 · e524628 · e524628
2 parents c885816 + 14ae8d5
commit e524628
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 181 deletions.
diff --git a/modules/dacIdSystem.md b/modules/dacIdSystem.md
@@ -1,11 +1,11 @@
-## DAC User ID Submodule
+## AudienceOne User ID Submodule
 
-DAC ID, provided by [D.A.Consortium Inc.](https://www.dac.co.jp/), is ID for ad targeting by using 1st party cookie.
+AudienceOne ID, provided by [D.A.Consortium Inc.](https://www.dac.co.jp/), is ID for ad targeting by using 1st party cookie.
 Please contact D.A.Consortium Inc. before using this ID.
 
-## Building Prebid with DAC ID Support
+## Building Prebid with AudienceOne ID Support
 
-First, make sure to add the DAC ID submodule to your Prebid.js package with:
+First, make sure to add the AudienceOne ID submodule to your Prebid.js package with:
 
 ```
 gulp build --modules=dacIdSystem

diff --git a/modules/zeta_global_sspBidAdapter.js b/modules/zeta_global_sspBidAdapter.js
@@ -99,7 +99,7 @@ export const spec = {
       user: params.user ? params.user : {},
       app: params.app ? params.app : {},
       ext: {
-        tags: params.tags ? params.tags : {},
+        tags: {...params.tags, shortname: params.shortname},
         sid: params.sid ? params.sid : undefined
       }
     };

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "6.26.0-pre",
+  "version": "6.27.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

diff --git a/test/spec/modules/fintezaAnalyticsAdapter_spec.js b/test/spec/modules/fintezaAnalyticsAdapter_spec.js
@@ -51,7 +51,7 @@ describe('finteza analytics adapter', function () {
 
   describe('track', () => {
     describe('bid request', () => {
-      it('builds and sends data', function () {
+      it('builds and sends request data', function () {
         const bidderCode = 'Bidder789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -95,7 +95,7 @@ describe('finteza analytics adapter', function () {
     });
 
     describe('bid response', () => {
-      it('builds and sends data', function () {
+      it('builds and sends response data', function () {
         const bidderCode = 'Bidder789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -154,7 +154,7 @@ describe('finteza analytics adapter', function () {
     });
 
     describe('bid won', () => {
-      it('builds and sends data', function () {
+      it('builds and sends bid won data', function () {
         const bidderCode = 'Bidder789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -194,7 +194,7 @@ describe('finteza analytics adapter', function () {
     });
 
     describe('bid timeout', () => {
-      it('builds and sends data', function () {
+      it('builds and sends timeout data', function () {
         const bidderCode = 'biDDer789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 

diff --git a/test/spec/modules/medianetRtdProvider_spec.js b/test/spec/modules/medianetRtdProvider_spec.js
diff --git a/test/spec/modules/zeta_global_sspBidAdapter_spec.js b/test/spec/modules/zeta_global_sspBidAdapter_spec.js
@@ -25,6 +25,25 @@ describe('Zeta Ssp Bid Adapter', function () {
     }
   ];
 
+  const params = {
+    user: {
+      uid: 222,
+      buyeruid: 333
+    },
+    tags: {
+      someTag: 444,
+    },
+    sid: 'publisherId',
+    shortname: 'test_shortname',
+    site: {
+      page: 'testPage'
+    },
+    app: {
+      bundle: 'testBundle'
+    },
+    test: 1
+  };
+
   const bannerRequest = [{
     bidId: 12345,
     auctionId: 67890,
@@ -41,18 +60,7 @@ describe('Zeta Ssp Bid Adapter', function () {
       consentString: 'consentString'
     },
     uspConsent: 'someCCPAString',
-    params: {
-      placement: 111,
-      user: {
-        uid: 222,
-        buyeruid: 333
-      },
-      tags: {
-        someTag: 444,
-        sid: 'publisherId'
-      },
-      test: 1
-    },
+    params: params,
     userIdAsEids: eids
   }];
 
@@ -72,18 +80,7 @@ describe('Zeta Ssp Bid Adapter', function () {
     refererInfo: {
       referer: 'http://www.zetaglobal.com/page?param=video'
     },
-    params: {
-      placement: 111,
-      user: {
-        uid: 222,
-        buyeruid: 333
-      },
-      tags: {
-        someTag: 444,
-        sid: 'publisherId'
-      },
-      test: 1
-    },
+    params: params
   }];
 
   it('Test the bid validation function', function () {
@@ -269,4 +266,20 @@ describe('Zeta Ssp Bid Adapter', function () {
 
     expect(payload.imp[0].banner).to.be.undefined;
   });
+
+  it('Test required params in banner request', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(payload.ext.sid).to.eql('publisherId');
+    expect(payload.ext.tags.someTag).to.eql(444);
+    expect(payload.ext.tags.shortname).to.eql('test_shortname');
+  });
+
+  it('Test required params in video request', function () {
+    const request = spec.buildRequests(videoRequest, videoRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(payload.ext.sid).to.eql('publisherId');
+    expect(payload.ext.tags.someTag).to.eql(444);
+    expect(payload.ext.tags.shortname).to.eql('test_shortname');
+  });
 });