Merge pull request prebid#14 from nathan-pubx/PTOW-2-fix-linting-errors

fixing bugs, modifying blob behaviour, addressing browser compatibility
nathan-pubx · May 15, 2024 · b973cd5 · b973cd5
2 parents 0425632 + 902d241
commit b973cd5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/modules/pubxaiAnalyticsAdapter.js b/modules/pubxaiAnalyticsAdapter.js
@@ -31,7 +31,7 @@ export const sendCache = new Proxy(
   {},
   {
     get: (target, name) => {
-      if (!Object.hasOwn(target, name)) {
+      if (!target.hasOwnProperty(name)) {
         target[name] = [];
       }
       return target[name];
@@ -50,7 +50,7 @@ export const auctionCache = new Proxy(
   {},
   {
     get: (target, name) => {
-      if (!Object.hasOwn(target, name)) {
+      if (!target.hasOwnProperty(name)) {
         target[name] = {
           bids: [],
           auctionDetail: {
@@ -107,7 +107,7 @@ const hasSendBeaconSupport = () => {
 const getAdServerDataForBid = (bid) => {
   const gptSlot = getGptSlotForAdUnitCode(bid);
   if (gptSlot) {
-    return Object.fromEntires(
+    return Object.fromEntries(
       gptSlot
         .getTargetingKeys()
         .filter(

diff --git a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
@@ -13,6 +13,15 @@ import { EVENTS } from '../../../src/constants.js';
 
 let events = require('src/events');
 
+const readBlobSafariCompat = (blob) => {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = () => resolve(reader.result)
+    reader.onerror = reject
+    reader.readAsText(blob)
+  })
+}
+
 describe('pubxai analytics adapter', () => {
   beforeEach(() => {
     sinon.stub(events, 'getEvents').returns([]);
@@ -702,11 +711,7 @@ describe('pubxai analytics adapter', () => {
         options: initOptions,
       });
       sinon.stub(navigator, 'sendBeacon').returns(true);
-      originalHD = document.hidden;
       originalVS = document.visibilityState;
-      document['__defineGetter__']('hidden', function () {
-        return 1;
-      });
       document['__defineGetter__']('visibilityState', function () {
         return 'hidden';
       });
@@ -717,9 +722,6 @@ describe('pubxai analytics adapter', () => {
       navigator.sendBeacon.restore();
       delete auctionCache['bc3806e4-873e-453c-8ae5-204f35e923b4'];
       delete auctionCache['auction2'];
-      document['__defineGetter__']('hidden', function () {
-        return originalHD;
-      });
       document['__defineGetter__']('visibilityState', function () {
         return originalVS;
       });
@@ -766,7 +768,7 @@ describe('pubxai analytics adapter', () => {
           prebidVersion: getGlobal()?.version,
         });
         expect(expectedData.type).to.equal('text/json');
-        expect(JSON.parse(await expectedData.text())).to.deep.equal([
+        expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
           [expectedAfterBidWon, expectedAfterBid][index],
         ]);
       }
@@ -811,7 +813,7 @@ describe('pubxai analytics adapter', () => {
 
       // Step 9: check that the data sent in the request is correct
       expect(expectedData.type).to.equal('text/json');
-      expect(JSON.parse(await expectedData.text())).to.deep.equal([
+      expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
         {
           ...expectedAfterBid,
           bids: [],
@@ -934,7 +936,7 @@ describe('pubxai analytics adapter', () => {
           prebidVersion: getGlobal()?.version,
         });
         expect(expectedData.type).to.equal('text/json');
-        expect(JSON.parse(await expectedData.text())).to.deep.equal([
+        expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
           auctionIdMapFn([expectedAfterBidWon, expectedAfterBid][index % 2], [
             {
               field: 'auctionId',
@@ -1050,7 +1052,7 @@ describe('pubxai analytics adapter', () => {
           prebidVersion: getGlobal()?.version,
         });
         expect(expectedData.type).to.equal('text/json');
-        expect(JSON.parse(await expectedData.text())).to.deep.equal([
+        expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
           [expectedAfterBidWon, expectedAfterBid][index],
           replaceProperty([expectedAfterBidWon, expectedAfterBid][index], [
             {