remove unneeded test and adjust test to work with oajs changes

.github/workflows/code-path-changes.yml

@@ -1,10 +1,7 @@
 name: Notify Code Path Changes
 
 on:
-  pull_request_target:
-    types: [opened, synchronize]
-    paths:
-      - '**'
+  workflow_dispatch:
 
 env:
   OAUTH2_CLIENT_ID: ${{ secrets.OAUTH2_CLIENT_ID }}
@@ -34,4 +31,4 @@ jobs:
 
       - name: Run Notification Script
         run: |
-          node .github/workflows/scripts/send-notification-on-change.js
+          node .github/workflows/scripts/send-notification-on-change.js

.github/workflows/codeql-analysis.yml

@@ -12,13 +12,15 @@
 name: "CodeQL"
 
 on:
-  push:
-    branches: [ "master"]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "master"]
-  schedule:
-    - cron: '22 11 * * 0'
+  workflow_dispatch:
+  ### RENABLE WHEN REPO IS PUBLIC ###
+  #push:
+    #branches: [ "master"]
+  #pull_request:
+    ## The branches below must be a subset of the branches above
+    #branches: [ "master"]
+  #schedule:
+    #- cron: '22 11 * * 0'
 
 jobs:
   analyze:

.github/workflows/jscpd.yml

@@ -1,6 +1,7 @@
 name: Check for Duplicated Code
 
 on:
+  workflow_dispatch:
   pull_request_target:
     branches:
       - master
@@ -121,4 +122,4 @@ jobs:
       if: env.filtered_report_exists == 'true'
       run: |
         echo "Duplications found, failing the check."
-        exit 1
+        exit 1

.github/workflows/test.yml

@@ -142,6 +142,7 @@ jobs:
   coveralls:
     name: Update coveralls
     needs: [checkout, test]
+    if: false #REMOVE ONCE REPO IS PUBLIC
     runs-on: ubuntu-latest
     steps:
       - name: Restore working directory

.gitignore

@@ -9,6 +9,9 @@ build
 test/app
 gpt.html
 gpt-each-bidder3.html
+browserstack.err
+local.log
+logs/
 
 # Selenium files
 bin

modules/utiqIdSystem.js

@@ -153,5 +153,5 @@ export const utiqIdSubmodule = {
   }
 };
 
-findUtiqService(storage, window.pbjs.refreshUserIds, LOG_PREFIX, MODULE_NAME);
+findUtiqService(storage, window.oajs.refreshUserIds, LOG_PREFIX, MODULE_NAME);
 submodule('userId', utiqIdSubmodule);

modules/utiqMtpIdSystem.js

@@ -140,5 +140,5 @@ export const utiqMtpIdSubmodule = {
   }
 };
 
-findUtiqService(storage, window.pbjs.refreshUserIds, LOG_PREFIX, MODULE_NAME);
+findUtiqService(storage, window.oajs.refreshUserIds, LOG_PREFIX, MODULE_NAME);
 submodule('userId', utiqMtpIdSubmodule);

test/helpers/testing-utils.js

@@ -37,7 +37,9 @@ const utils = {
         it(`should render GAM creative`, async () => {
           await utils.switchFrame(expectGAMCreative);
           if (nestedIframe) {
-            await utils.switchFrame('iframe[srcdoc]');
+            // needed :not([style]) as the orgignal test uses the universal creative.js
+            // instead of [format].js, which inserted another iframe[srcdoc] causing the wrong iframe to be focused
+            await utils.switchFrame('iframe[srcdoc]:not([style])');
           }
           const creative = [
             'a > img', // banner

test/pages/banner.html

@@ -13,8 +13,8 @@
 	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
 
 	<script>
-		var pbjs = pbjs || {};
-		pbjs.que = pbjs.que || [];
+		var oajs = oajs || {};
+		oajs.que = oajs.que || [];
 
 		// Prebid Banner Ad Unit
 		const adUnits = [{
@@ -56,16 +56,16 @@
 			googletag.pubads().disableInitialLoad();
 		});
 
-		pbjs.que.push(function () {
-			pbjs.setConfig({enableTIDs: true});
-			pbjs.addAdUnits(adUnits);
-			pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+		oajs.que.push(function () {
+			oajs.setConfig({enableTIDs: true});
+			oajs.addAdUnits(adUnits);
+			oajs.requestBids({ bidsBackHandler: sendAdServerRequest });
 		});
 
 		function sendAdServerRequest() {
 			googletag.cmd.push(function () {
-				pbjs.que.push(function () {
-					pbjs.setTargetingForGPTAsync('div-gpt-ad-1460505748561-0');
+				oajs.que.push(function () {
+					oajs.setTargetingForGPTAsync('div-gpt-ad-1460505748561-0');
 					googletag.pubads().refresh();
 				});
 			});
@@ -75,7 +75,7 @@
 	<script>
 		googletag.cmd.push(function () {
 			googletag
-				.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0')
+				.defineSlot('/92296675/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0')
 				.addService(googletag.pubads());
 
 			googletag.pubads().enableSingleRequest();

test/pages/banner_sync.html

@@ -13,8 +13,8 @@
     <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
 
     <script>
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
+        var oajs = oajs || {};
+        oajs.que = oajs.que || [];
 
         // Prebid Banner Ad Unit
         const adUnits = [{
@@ -56,16 +56,16 @@
             googletag.pubads().disableInitialLoad();
         });
 
-        pbjs.que.push(function () {
-            pbjs.setConfig({enableTIDs: true});
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+        oajs.que.push(function () {
+            oajs.setConfig({enableTIDs: true});
+            oajs.addAdUnits(adUnits);
+            oajs.requestBids({ bidsBackHandler: sendAdServerRequest });
         });
 
         function sendAdServerRequest() {
             googletag.cmd.push(function () {
-                pbjs.que.push(function () {
-                    pbjs.setTargetingForGPTAsync('div-gpt-ad-1460505748561-0');
+                oajs.que.push(function () {
+                    oajs.setTargetingForGPTAsync('div-gpt-ad-1460505748561-0');
                     googletag.pubads().refresh();
                 });
             });
@@ -75,7 +75,7 @@
     <script>
         googletag.cmd.push(function () {
             googletag
-                .defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0')
+                .defineSlot('/92296675/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0')
                 .addService(googletag.pubads());
 
             googletag.pubads().enableSingleRequest();

test/pages/bidderSettings.html

@@ -22,7 +22,7 @@
       }]
 
     }, {
-      code: '/19968336/prebid_native_example_2',
+      code: '/92296675/prebid_native_example_2',
       sizes: [
         [1, 1]
       ],
@@ -54,8 +54,8 @@
       }]
     }];
 
-    var pbjs = pbjs || {};
-    pbjs.que = pbjs.que || [];
+    var oajs = oajs || {};
+    oajs.que = oajs.que || [];
 
   </script>
 
@@ -66,10 +66,10 @@
       googletag.pubads().disableInitialLoad();
     });
 
-    pbjs.que.push(function () {
-      pbjs.setConfig({enableTIDs: true});
-      pbjs.addAdUnits(adUnits);
-      pbjs.bidderSettings = {
+    oajs.que.push(function () {
+      oajs.setConfig({enableTIDs: true});
+      oajs.addAdUnits(adUnits);
+      oajs.bidderSettings = {
         appnexus: {
           adserverTargeting: [
             {
@@ -86,18 +86,18 @@
           ]
         }
       }
-      pbjs.requestBids({
+      oajs.requestBids({
         bidsBackHandler: sendAdserverRequest,
         timeout: PREBID_TIMEOUT
       });
     });
 
     function sendAdserverRequest() {
-      if (pbjs.adserverRequestSent) return;
-      pbjs.adserverRequestSent = true;
+      if (oajs.adserverRequestSent) return;
+      oajs.adserverRequestSent = true;
       googletag.cmd.push(function () {
-        pbjs.que.push(function () {
-          pbjs.setTargetingForGPTAsync();
+        oajs.que.push(function () {
+          oajs.setTargetingForGPTAsync();
           googletag.pubads().refresh();
         });
       });
@@ -107,7 +107,7 @@
 
   <script>
     googletag.cmd.push(function () {
-      googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
+      googletag.defineSlot('/92296675/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
 
       googletag.pubads().enableSingleRequest();
       googletag.enableServices();

test/pages/currency.html

@@ -31,7 +31,7 @@
             }]
 
         },{
-			code: '/19968336/prebid_native_example_2',
+			code: '/92296675/prebid_native_example_2',
 			sizes: [
 				[1, 1]
 			],
@@ -63,8 +63,8 @@
 			}]
 		}];
 
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
+        var oajs = oajs || {};
+        oajs.que = oajs.que || [];
 
     </script>
 
@@ -75,28 +75,28 @@
             googletag.pubads().disableInitialLoad();
         });
 
-        pbjs.que.push(function() {
-            pbjs.setConfig({
+        oajs.que.push(function() {
+            oajs.setConfig({
                 enableTIDs: true,
                 "currency": {
                     "adServerCurrency": "GBP",
                     "granularityMultiplier": 1,
                     "rates": { "USD": { "GBP": 0.80 }}
                 }
             });
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
+            oajs.addAdUnits(adUnits);
+            oajs.requestBids({
                 bidsBackHandler: sendAdserverRequest,
                 timeout: PREBID_TIMEOUT
             });
         });
 
         function sendAdserverRequest() {
-            if (pbjs.adserverRequestSent) return;
-            pbjs.adserverRequestSent = true;
+            if (oajs.adserverRequestSent) return;
+            oajs.adserverRequestSent = true;
             googletag.cmd.push(function() {
-                pbjs.que.push(function() {
-                    pbjs.setTargetingForGPTAsync('div-gpt-ad-1460505748561-0');
+                oajs.que.push(function() {
+                    oajs.setTargetingForGPTAsync('div-gpt-ad-1460505748561-0');
                     googletag.pubads().refresh();
                 });
             });
@@ -110,7 +110,7 @@
 
     <script>
         googletag.cmd.push(function () {
-            googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
+            googletag.defineSlot('/92296675/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
 
             googletag.pubads().enableSingleRequest();
             googletag.enableServices();

test/pages/instream.html

@@ -21,8 +21,8 @@
 
     <script>
 
-      var pbjs = pbjs || {};
-      pbjs.que = pbjs.que || [];
+      var oajs = oajs || {};
+      oajs.que = oajs.que || [];
 
       /*
        Prebid Video adUnit
@@ -48,39 +48,39 @@
         ]
       };
 
-      pbjs.que.push(function(){
-        pbjs.onEvent('auctionEnd', function() {
-            console.log(pbjs.getAdserverTargeting('video1'));
+      oajs.que.push(function(){
+        oajs.onEvent('auctionEnd', function() {
+            console.log(oajs.getAdserverTargeting('video1'));
           let pEl = document.createElement('p');
           pEl.innerText = 'PREBID HAS FINISHED';
           pEl.id = 'statusText';
           let parDiv = document.getElementById('event-window');
           parDiv.appendChild(pEl);
         });
 
-        pbjs.addAdUnits(videoAdUnit);
-        pbjs.setConfig({
+        oajs.addAdUnits(videoAdUnit);
+        oajs.setConfig({
                     enableTIDs: true,
                     debug: true,
                     cache: {
                         useLocal: true,
                     }
                 });
-        pbjs.requestBids({
+        oajs.requestBids({
           timeout: 10000,
           bidsBackHandler : function(bids) {
-            var videoUrl = pbjs.adServers.gam.buildVideoUrl({
+            var videoUrl = oajs.adServers.gam.buildVideoUrl({
               adUnit: videoAdUnit,
               params: {
-                iu: '/19968336/prebid_cache_video_adunit'
+                iu: '/92296675/prebid_cache_video_adunit'
               }
             });
 
             invokeVideoPlayer(videoUrl);
           }
         });
       });
-      pbjs.bidderSettings = {
+      oajs.bidderSettings = {
         appnexus: {
           bidCpmAdjustment: function() {
             return 10.00;