Libs tidy up pt.3 (#1721)

* inline spacefinder utils

* Inline and simplify get-ad-iframe

* Delete unused geolocation functions

src/core/targeting/youtube-ima.spec.ts

@@ -1,9 +1,7 @@
 import type { ConsentState } from '@guardian/libs';
-import * as BuildPageTargeting from './build-page-targeting';
+import { buildPageTargeting } from './build-page-targeting';
 import { buildImaAdTagUrl } from './youtube-ima';
 
-const { buildPageTargeting } = BuildPageTargeting;
-
 jest.mock('./build-page-targeting', () => ({
 	// we want the real filterValues()
 	...jest.requireActual('./build-page-targeting'),

src/display/request-bids.ts

@@ -41,7 +41,7 @@ const retainAdSizeOnRefresh = (
  * passed in that have already had bids requested, this can happen if they're already in
  * the viewport, it will only request bids for adverts that haven't already had bids requested.
  */
-export const requestBidsForAds = async (adverts: Advert[]): Promise<void> => {
+const requestBidsForAds = async (adverts: Advert[]): Promise<void> => {
 	const adsToRequestBidsFor = adverts.filter(
 		(advert) => !advert.headerBiddingBidRequest,
 	);

src/events/render-advert.ts

@@ -1,6 +1,5 @@
 import { adSizes } from '../core/ad-sizes';
 import type { Advert } from '../define/Advert';
-import { getAdIframe } from '../lib/dfp/get-ad-iframe';
 import { $$ } from '../utils/$$';
 import fastdom from '../utils/fastdom-promise';
 import { reportError } from '../utils/report-error';
@@ -179,6 +178,21 @@ const addContainerClass = (adSlotNode: HTMLElement, isRendered: boolean) => {
 		});
 };
 
+/**
+ * Check if the ad slot has a corresponding iframe to indicte the ad has rendered.
+ * @param adSlot
+ * @returns
+ */
+const hasIframe = (adSlot: HTMLElement): Promise<boolean> =>
+	new Promise((resolve) => {
+		// DFP will sometimes return empty iframes, denoted with a '__hidden__' parameter embedded in its ID.
+		// We need to be sure only to select the ad content frame.
+		const iFrame = adSlot.querySelector<HTMLIFrameElement>(
+			'iframe:not([id*="__hidden__"])',
+		);
+		resolve(!!iFrame);
+	});
+
 /**
  * @param advert - as defined in lib/dfp/Advert
  * @param slotRenderEndedEvent - GPT slotRenderEndedEvent
@@ -189,7 +203,7 @@ const renderAdvert = (
 	slotRenderEndedEvent: googletag.events.SlotRenderEndedEvent,
 ): Promise<boolean> => {
 	addContentClass(advert.node);
-	return getAdIframe(advert.node)
+	return hasIframe(advert.node)
 		.then((isRendered) => {
 			const creativeTemplateId =
 				slotRenderEndedEvent.creativeTemplateId ?? undefined;

src/init/consented/prepare-googletag.spec.ts

@@ -56,8 +56,10 @@ jest.mock('display/display-lazy-ads', () => ({
 	displayLazyAds: jest.fn(),
 }));
 
-jest.mock('core/ad-sizes', () => {
-	const adSizes: typeof AdSizesType = jest.requireActual('core/ad-sizes');
+jest.mock('../../core/ad-sizes', () => {
+	const adSizes: typeof AdSizesType = jest.requireActual(
+		'../../core/ad-sizes',
+	);
 	const { createAdSize } = adSizes;
 	return {
 		...adSizes,

src/init/consented/static-ad-slots.ts

@@ -53,7 +53,7 @@ const decideAdditionalSizes = (adSlot: HTMLElement): SizeMapping => {
 /**
  * Static ad slots that were rendered on the page by the server are collected here.
  *
- * For dynamic ad slots that are created at js-runtime, see:
+ * For dynamic ad slots that are created at runtime, see:
  *  - article-aside-adverts
  *  - article-body-adverts
  *  - high-merch

src/insert/spacefinder/rules.ts

@@ -1,11 +1,27 @@
 import { adSlotContainerClass } from '../../core/create-ad-slot';
 import { adSizes } from '../../core/index';
 import type { OpponentSelectorRules, SpacefinderRules } from './spacefinder';
-import { isInHighValueSection } from './utils';
 
 const bodySelector = '.article-body-commercial-selector';
 const adSlotContainerSelector = `.${adSlotContainerClass}`;
 
+const highValueSections = [
+	'business',
+	'environment',
+	'music',
+	'money',
+	'artanddesign',
+	'science',
+	'stage',
+	'travel',
+	'wellness',
+	'games',
+];
+
+const isInHighValueSection = highValueSections.includes(
+	window.guardian.config.page.section,
+);
+
 /**
  * As estimation of the height of the most viewed island.
  * This appears from desktop breakpoints on the right-hand side.

src/utils/geo-utils.spec.ts

@@ -1,4 +1,4 @@
-import type { CountryCode } from '@guardian/libs';
+import { setCookie } from '@guardian/libs';
 import {
 	_,
 	isInAuOrNz,
@@ -11,16 +11,10 @@ import {
 	isInUsOrCa,
 } from './geo-utils';
 
-let mockCountryCode: CountryCode;
-jest.mock('utils/geolocation', () => ({
-	getCountryCode: jest.fn(() => mockCountryCode),
-}));
-
 describe('Geolocation Utils', () => {
 	beforeEach(() => {
 		_.resetModule();
 	});
-
 	const testCases = [
 		{
 			fnName: 'isInUk()',
@@ -98,7 +92,10 @@ describe('Geolocation Utils', () => {
 
 	testCases.forEach((testCase) => {
 		it(`Only ${testCase.fnName} return true for geolocation '${testCase.mockCountryCode}'`, () => {
-			mockCountryCode = testCase.mockCountryCode;
+			setCookie({
+				name: 'GU_geo_country',
+				value: testCase.mockCountryCode,
+			});
 			expect(isInUk()).toBe(testCase.expectedUKValue);
 			expect(isInUsa()).toBe(testCase.expectedUsaValue);
 			expect(isInCanada()).toBe(testCase.expectedCaValue);