prebid.js 7.25.0 → 7.27.0

package/test/spec/refererDetection_spec.js

@@ -128,11 +128,49 @@ describe('Referer detection', () => {
           numIframes: 0,
           stack: ['https://example.com/some/page'],
           canonicalUrl: 'https://example.com/canonical/page',
-          page: 'https://example.com/canonical/page',
+          page: 'https://example.com/some/page',
           ref: 'https://othersite.com/',
           domain: 'example.com'
         });
       });
+
+      it('Should set page and canonical to pageUrl value set in config if present, even if canonical url is also present in head', () => {
+        config.setConfig({'pageUrl': 'https://www.set-from-config.com/path'});
+        const testWindow = buildWindowTree(['https://example.com/some/page'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page',
+          location: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page'],
+          canonicalUrl: 'https://www.set-from-config.com/path',
+          page: 'https://www.set-from-config.com/path',
+          ref: 'https://othersite.com/',
+          domain: 'www.set-from-config.com'
+        });
+      });
+
+      it('Should set page with query params if canonical url is present without query params but the current page does have them', () => {
+        config.setConfig({'pageUrl': 'https://www.set-from-config.com/path'});
+        const testWindow = buildWindowTree(['https://example.com/some/page?query1=123&query2=456'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page?query1=123&query2=456',
+          location: 'https://example.com/some/page?query1=123&query2=456',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page?query1=123&query2=456'],
+          canonicalUrl: 'https://www.set-from-config.com/path',
+          page: 'https://www.set-from-config.com/path?query1=123&query2=456',
+          ref: 'https://othersite.com/',
+          domain: 'www.set-from-config.com'
+        });
+      });
     });
 
     describe('Friendly iframes', () => {
@@ -174,7 +212,7 @@ describe('Referer detection', () => {
             'https://example.com/third/page'
           ],
           canonicalUrl: 'https://example.com/canonical/page',
-          page: 'https://example.com/canonical/page',
+          page: 'https://example.com/some/page',
           ref: 'https://othersite.com/',
           domain: 'example.com'
         });
@@ -317,7 +355,7 @@ describe('Referer detection', () => {
           'https://ad-iframe.ampproject.org/ad'
         ],
         canonicalUrl: 'https://example.com/some/page/',
-        page: 'https://example.com/some/page/',
+        page: 'https://example.com/some/page/amp/',
         ref: null,
         domain: 'example.com'
       });
@@ -344,7 +382,7 @@ describe('Referer detection', () => {
           'https://ad-iframe.ampproject.org/ad'
         ],
         canonicalUrl: 'https://example.com/some/page/',
-        page: 'https://example.com/some/page/',
+        page: 'https://example.com/some/page/amp/',
         ref: null,
         domain: 'example.com'
       });
@@ -384,7 +422,7 @@ describe('Referer detection', () => {
             'https://ad-iframe.ampproject.org/ad'
           ],
           canonicalUrl: 'https://example.com/some/page/',
-          page: 'https://example.com/some/page/',
+          page: 'https://example.com/some/page/amp/',
           ref: null,
           domain: 'example.com',
         });
@@ -412,7 +450,7 @@ describe('Referer detection', () => {
             'https://ad-iframe.ampproject.org/ad'
           ],
           canonicalUrl: 'https://example.com/some/page/',
-          page: 'https://example.com/some/page/',
+          page: 'https://example.com/some/page/amp/',
           ref: null,
           domain: 'example.com'
         });
@@ -441,7 +479,7 @@ describe('Referer detection', () => {
             'https://ad-iframe.ampproject.org/ad'
           ],
           canonicalUrl: 'https://example.com/some/page/',
-          page: 'https://example.com/some/page/',
+          page: 'https://example.com/some/page/amp/',
           ref: null,
           domain: 'example.com',
         });

package/test/spec/unit/core/storageManager_spec.js

@@ -8,6 +8,7 @@ import {
 import { config } from 'src/config.js';
 import * as utils from 'src/utils.js';
 import {hook} from '../../../../src/hook.js';
+import {VENDORLESS_GVLID} from '../../../../src/consentHandler.js';
 
 describe('storage manager', function() {
   before(() => {
@@ -73,7 +74,7 @@ describe('storage manager', function() {
 
     it('should respect (vendorless) consent enforcement', () => {
       storage.localStorageIsEnabled();
-      expect(validateHook.args[0][1]).to.eql(true); // isVendorless should be set to true
+      expect(validateHook.args[0][1]).to.equal(VENDORLESS_GVLID); // gvlid should be set to VENDORLESS_GVLID
     });
 
     it('should respect the deviceAccess flag', () => {