-
- chartbeat
-
-
-
-
-
- د بي بي سي خبرونه , ۱۷ سپتمبر ۲۰۲۴
-
-
-
-
-
- دغه پروګرام د خپرولو لپاره چمتو نه دی.
-
-
-
-
-
-
- د بي بي سي خبرونه
-
-
- ,
-
-
- د بي بي سي خبرونه
-
-
-
-
- نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي
- ۱۷ سپتمبر ۲۰۲۴
+ ۲۱ نومبر ۲۰۲۴
diff --git a/src/app/pages/OnDemandTvPage/fixtureData/afrique.json b/src/app/pages/OnDemandTvPage/fixtureData/afrique.json
deleted file mode 100644
index cab5d5ff127..00000000000
--- a/src/app/pages/OnDemandTvPage/fixtureData/afrique.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "language": "fr",
- "brandTitle": "BBC Info",
- "episodeTitle": "BBC Info",
- "headline": "BBC Info",
- "shortSynopsis": "Le journal télévisé international de BBC Afrique.",
- "id": "urn:bbc:ares:ws_media:brand:bbc_afrique_tv/w13xttmz",
- "contentType": "player-episode",
- "episodeId": "w172yrnhsjqw4c9",
- "masterBrand": "bbc_afrique_tv",
- "releaseDateTimeStamp": 1679011200000,
- "pageTitle": "BBC Info - BBC News Afrique",
- "pageIdentifier": "afrique.bbc_afrique_tv.tv_programmes.w13xttmz.page",
- "imageUrl": "ichef.bbci.co.uk/images/ic/$recipe/p08b22y1.png",
- "promoBrandTitle": "BBC Info",
- "durationISO8601": "PT15M",
- "thumbnailImageUrl": "https://ichef.bbci.co.uk/images/ic/$recipe/p08b22y1.png",
- "metadata": {
- "type": "On Demand TV"
- },
- "mediaBlocks": [
- {
- "type": "tvMedia",
- "model": {
- "id": "w172yrnhsjqw4c9",
- "subType": "episode",
- "format": "Video",
- "title": "17/03/2023 GMT",
- "synopses": {
- "short": "Le journal télévisé international de BBC Afrique.",
- "medium": "Le journal télévisé international de BBC Afrique."
- },
- "imageUrl": "ichef.bbci.co.uk/images/ic/$recipe/p08b22y1.png",
- "embedding": false,
- "advertising": false,
- "versions": [
- {
- "versionId": "w1msk0thd8j6rng",
- "types": ["Original"],
- "duration": 900,
- "durationISO8601": "PT15M",
- "warnings": {},
- "availableTerritories": {
- "uk": true,
- "nonUk": true,
- "world": false
- },
- "availableFrom": 1679081400000,
- "availabilityStatus": "available"
- }
- ],
- "availability": "available",
- "smpKind": "programme",
- "episodeTitle": "BBC Info",
- "type": "media"
- }
- }
- ]
-}
diff --git a/src/app/pages/OnDemandTvPage/fixtureData/pashto.json b/src/app/pages/OnDemandTvPage/fixtureData/pashto.json
deleted file mode 100644
index 04133fecfcf..00000000000
--- a/src/app/pages/OnDemandTvPage/fixtureData/pashto.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "language": "ps",
- "brandTitle": " د بي بي سي خبرونه ",
- "episodeTitle": " د بي بي سي خبرونه ",
- "headline": " د بي بي سي خبرونه ",
- "shortSynopsis": "نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي",
- "id": "urn:bbc:ares:ws_media:brand:bbc_pashto_tv/w13xttn4",
- "contentType": "player-episode",
- "episodeId": "w172zmsln64zg23",
- "masterBrand": "bbc_pashto_tv",
- "releaseDateTimeStamp": 1726531200000,
- "pageTitle": " د بي بي سي خبرونه - BBC News پښتو",
- "pageIdentifier": "pashto.bbc_pashto_tv.tv_programmes.w13xttn4.page",
- "imageUrl": "ichef.bbci.co.uk/images/ic/$recipe/p08b23c8.png",
- "promoBrandTitle": " د بي بي سي خبرونه ",
- "durationISO8601": "PT28M",
- "thumbnailImageUrl": "https://ichef.bbci.co.uk/images/ic/$recipe/p08b23c8.png",
- "metadata": {
- "type": "On Demand TV"
- },
- "mediaBlocks": [
- {
- "type": "tvMedia",
- "model": {
- "id": "w172zmsln64zg23",
- "subType": "episode",
- "format": "Video",
- "title": "17/09/2024 GMT",
- "synopses": {
- "short": "نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي",
- "medium": "نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي",
- "long": "د بي بي سي پښتو ټلویزیوني خپرونه چې هره ورځ د افغانستان په شپږ بجو په ژوندۍ بڼه خپرېږي. دلته یې لیدلی شئ."
- },
- "imageUrl": "ichef.bbci.co.uk/images/ic/$recipe/p08b23c8.png",
- "embedding": false,
- "advertising": false,
- "versions": [
- {
- "versionId": "w1mskz6ljjcbqbb",
- "types": ["Original"],
- "duration": 1680,
- "durationISO8601": "PT28M",
- "warnings": {},
- "availableTerritories": {
- "uk": true,
- "nonUk": true,
- "world": false
- },
- "availableFrom": 1726581480000,
- "availabilityStatus": "available"
- }
- ],
- "availability": "available",
- "smpKind": "programme",
- "episodeTitle": " د بي بي سي خبرونه ",
- "type": "media"
- }
- }
- ]
-}
diff --git a/src/app/pages/OnDemandTvPage/index.stories.tsx b/src/app/pages/OnDemandTvPage/index.stories.tsx
index efbb49bcf6b..e6372089056 100644
--- a/src/app/pages/OnDemandTvPage/index.stories.tsx
+++ b/src/app/pages/OnDemandTvPage/index.stories.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { BrowserRouter } from 'react-router-dom';
import WithTimeMachine from '#testHelpers/withTimeMachine';
-import { MEDIA_PAGE } from '#app/routes/utils/pageTypes';
+import { TV_PAGE } from '#app/routes/utils/pageTypes';
import { StoryArgs, StoryProps } from '#app/models/types/storybook';
import { Services } from '#app/models/types/global';
+import { data as afrique } from '#data/afrique/bbc_afrique_tv/tv_programmes/w13xttmz.json';
+import { data as pashto } from '#data/pashto/bbc_pashto_tv/tv_programmes/w13xttn4.json';
import { OnDemandTvPage } from '..';
-import afrique from './fixtureData/afrique.json';
-import pashto from './fixtureData/pashto.json';
import { OnDemandTVProps } from './OnDemandTvPage';
const onDemandTvFixtures: {
@@ -40,7 +40,7 @@ const Component = ({ service }: StoryProps) => {
service={service}
loading={false}
error=""
- pageType={MEDIA_PAGE}
+ pageType={TV_PAGE}
/>
);
diff --git a/src/app/pages/OnDemandTvPage/index.test.tsx b/src/app/pages/OnDemandTvPage/index.test.tsx
index 862173d0286..ffd73e014dc 100644
--- a/src/app/pages/OnDemandTvPage/index.test.tsx
+++ b/src/app/pages/OnDemandTvPage/index.test.tsx
@@ -1,20 +1,18 @@
import { FetchMock } from 'jest-fetch-mock';
import React from 'react';
-import assocPath from 'ramda/src/assocPath';
import pashtoPageData from '#data/pashto/bbc_pashto_tv/tv_programmes/w13xttn4.json';
import * as analyticsUtils from '#lib/analyticsUtils';
import getInitialData from '#app/routes/onDemandTV/getInitialData';
import withMediaError from '#lib/utilities/episodeAvailability/withMediaError';
-import { MEDIA_PAGE } from '#app/routes/utils/pageTypes';
+import { TV_PAGE } from '#app/routes/utils/pageTypes';
import { Services } from '#app/models/types/global';
import {
act,
render,
} from '../../components/react-testing-library-with-providers';
-import * as MediaLoader from '../../components/MediaLoader';
import _OnDemandTvPage, { OnDemandTVProps } from './OnDemandTvPage';
-const pageType = MEDIA_PAGE;
+const pageType = TV_PAGE;
const OnDemandTvPage = withMediaError(_OnDemandTvPage);
@@ -57,7 +55,7 @@ jest.mock('../../components/ChartbeatAnalytics', () => {
const { env } = process;
-describe('OnDemand TV Brand Page ', () => {
+describe('OnDemand TV Page ', () => {
beforeEach(() => {
process.env = { ...env };
});
@@ -67,11 +65,12 @@ describe('OnDemand TV Brand Page ', () => {
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
+
await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
@@ -82,7 +81,7 @@ describe('OnDemand TV Brand Page ', () => {
expect(visuallyHiddenHeadline).toBeInTheDocument();
expect(visuallyHiddenHeadline?.innerHTML).toEqual(
- ' د بي بي سي خبرونه , ۱۷ سپتمبر ۲۰۲۴',
+ ' د بي بي سي خبرونه , ۲۱ نومبر ۲۰۲۴',
);
});
@@ -91,12 +90,12 @@ describe('OnDemand TV Brand Page ', () => {
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
// @ts-expect-error react testing library returns the required query
const { getByTestId } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
@@ -112,12 +111,12 @@ describe('OnDemand TV Brand Page ', () => {
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
// @ts-expect-error react testing library returns the required query
const { container } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
@@ -133,12 +132,12 @@ describe('OnDemand TV Brand Page ', () => {
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
// @ts-expect-error react testing library returns the required query
const { container } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
@@ -151,12 +150,12 @@ describe('OnDemand TV Brand Page ', () => {
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
// @ts-expect-error react testing library returns the required query
const { container } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
@@ -169,17 +168,17 @@ describe('OnDemand TV Brand Page ', () => {
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
// @ts-expect-error react testing library returns the required query
const { getByText } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
- expect(getByText('۱۷ سپتمبر ۲۰۲۴')).toBeInTheDocument();
+ expect(getByText('۲۱ نومبر ۲۰۲۴')).toBeInTheDocument();
});
it('should show the summary for OnDemand TV Pages', async () => {
@@ -187,12 +186,12 @@ describe('OnDemand TV Brand Page ', () => {
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
// @ts-expect-error react testing library returns the required query
const { getByText } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
@@ -207,12 +206,12 @@ describe('OnDemand TV Brand Page ', () => {
fetchMock.mockResponse(JSON.stringify(pashtoPageData));
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
// @ts-expect-error react testing library returns the required query
const { container } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
@@ -224,53 +223,21 @@ describe('OnDemand TV Brand Page ', () => {
expect(videoPlayer).toBeInTheDocument();
});
- it('should use the derived page identifier to render the video player', async () => {
- const mediaLoaderSpy = jest.spyOn(MediaLoader, 'default');
-
- process.env.SIMORGH_APP_ENV = 'live';
- fetchMock.mockResponse(JSON.stringify(pashtoPageData));
- const { pageData } = await getInitialData({
- path: 'some-ondemand-tv-path',
- pageType,
- toggles,
- });
- const expectedMediaOverrides = {
- model: {
- language: 'ps',
- pageIdentifierOverride: 'pashto.bbc_pashto_tv.tv.w172zmsln64zg23.page',
- pageTitleOverride: ' د بي بي سي خبرونه ',
- },
- type: 'mediaOverrides',
+ it('should show the expired content message if episode is expired', async () => {
+ const pageDataWithExpiredEpisode = {
+ ...pashtoPageData,
};
+ pageDataWithExpiredEpisode.data.episodeAvailability = 'expired';
- await renderPage({
- // @ts-expect-error partial data required for testing purposes
- pageData,
- service: 'pashto',
- });
-
- const mediaLoaderProps = mediaLoaderSpy.mock.calls[0][0];
- const { blocks } = mediaLoaderProps;
-
- expect(mediaLoaderSpy).toHaveBeenCalled();
- expect(blocks).toEqual(expect.arrayContaining([expectedMediaOverrides]));
- });
-
- it('should show the expired content message if episode is expired', async () => {
- const pageDataWithExpiredEpisode = assocPath(
- ['content', 'blocks', 0, 'availability'],
- 'notAvailable',
- pashtoPageData,
- );
fetchMock.mockResponse(JSON.stringify(pageDataWithExpiredEpisode));
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
// @ts-expect-error react testing library returns the required queries
const { container, getByText } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
@@ -281,46 +248,18 @@ describe('OnDemand TV Brand Page ', () => {
});
it('should show the future content message if episode is not yet available', async () => {
- const pageDataWithFutureEpisode = assocPath(
- ['content', 'blocks', 0, 'availability'],
- 'future',
- pashtoPageData,
- );
- fetchMock.mockResponse(JSON.stringify(pageDataWithFutureEpisode));
- const { pageData } = await getInitialData({
- path: 'some-ondemand-tv-path',
- pageType,
- toggles,
- });
- // @ts-expect-error react testing library returns the required queries
- const { container, getByText } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
- pageData,
- service: 'pashto',
- });
- const notYetAvailableEl = getByText(
- 'دغه پروګرام د خپرولو لپاره چمتو نه دی.',
- );
+ const pageDataWithFutureEpisode = { ...pashtoPageData };
+ pageDataWithFutureEpisode.data.episodeAvailability = 'not-yet-available';
- expect(notYetAvailableEl).toBeInTheDocument();
- expect(container).toMatchSnapshot();
- });
-
- it('should show the future content message if episode is pending', async () => {
- const pageDataWithFutureEpisode = assocPath(
- ['content', 'blocks', 0, 'availability'],
- 'pending',
- pashtoPageData,
- );
fetchMock.mockResponse(JSON.stringify(pageDataWithFutureEpisode));
const { pageData } = await getInitialData({
path: 'some-ondemand-tv-path',
+ service: 'pashto',
pageType,
toggles,
});
// @ts-expect-error react testing library returns the required queries
const { container, getByText } = await renderPage({
- // @ts-expect-error partial data required for testing purposes
pageData,
service: 'pashto',
});
diff --git a/src/app/routes/onDemandTV/getInitialData/index.js b/src/app/routes/onDemandTV/getInitialData/index.js
deleted file mode 100644
index 6b85c4c13f2..00000000000
--- a/src/app/routes/onDemandTV/getInitialData/index.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import pathOr from 'ramda/src/pathOr';
-import pathWithLogging, {
- LOG_LEVELS,
-} from '#lib/utilities/logging/pathWithLogging';
-import { TV_MISSING_FIELD } from '#lib/logger.const';
-import getEpisodeAvailability, {
- getUrl,
-} from '#lib/utilities/episodeAvailability';
-import processRecentEpisodes from '#app/routes/utils/processRecentEpisodes';
-import fetchPageData from '../../utils/fetchPageData';
-import overrideRendererOnTest from '../../utils/overrideRendererOnTest';
-import getPlaceholderImageUrl from '../../utils/getPlaceholderImageUrl';
-import getErrorStatusCode from '../../utils/fetchPageData/utils/getErrorStatusCode';
-
-const DEFAULT_TOGGLE_VALUE = { enabled: false, value: 4 };
-
-const getRecentEpisodesToggle = pathOr(DEFAULT_TOGGLE_VALUE, [
- 'recentVideoEpisodes',
-]);
-
-export default async ({ path: pathname, pageType, toggles }) => {
- try {
- const onDemandTvDataPath = overrideRendererOnTest(pathname);
- const { json, status } = await fetchPageData({
- path: onDemandTvDataPath,
- pageType,
- });
- const recentEpisodesToggle = getRecentEpisodesToggle(toggles);
- const { enabled: showRecentEpisodes, value: recentEpisodesLimit } =
- recentEpisodesToggle;
-
- const get = pathWithLogging(getUrl(json), TV_MISSING_FIELD, json);
-
- const episodeId = get(['content', 'blocks', 0, 'id'], LOG_LEVELS.ERROR);
- const recentEpisodes = showRecentEpisodes
- ? processRecentEpisodes(json, {
- exclude: episodeId,
- recentEpisodesLimit,
- })
- : [];
-
- const mediaBlocks = get(['content', 'blocks']).map(block => {
- return {
- type: 'tv',
- model: { ...block },
- };
- });
-
- const pageIdentifier = get([
- 'metadata',
- 'analyticsLabels',
- 'pageIdentifier',
- ]);
-
- return {
- status,
- pageData: {
- metadata: {
- type: 'On Demand TV',
- atiAnalytics: {
- pageIdentifier,
- },
- },
- language: get(['metadata', 'language']),
- brandTitle: get(['metadata', 'title']),
- id: get(['metadata', 'id'], LOG_LEVELS.ERROR),
- headline: get(['promo', 'headlines', 'headline'], LOG_LEVELS.WARN),
- shortSynopsis: get(['promo', 'media', 'synopses', 'short']),
- mediumSynopsis: get(['promo', 'media', 'synopses', 'medium']),
- contentType: get(['metadata', 'analyticsLabels', 'contentType']),
- pageTitle: get(['metadata', 'analyticsLabels', 'pageTitle']),
- pageIdentifier,
- releaseDateTimeStamp: get(
- ['metadata', 'releaseDateTimeStamp'],
- LOG_LEVELS.WARN,
- ),
- durationISO8601: get([
- 'promo',
- 'media',
- 'versions',
- 0,
- 'durationISO8601',
- ]),
- thumbnailImageUrl: getPlaceholderImageUrl(
- get(['promo', 'media', 'imageUrl']),
- ),
- promoBrandTitle: get(['promo', 'brand', 'title']),
- masterBrand: get(['metadata', 'createdBy'], LOG_LEVELS.ERROR),
- episodeId,
- imageUrl: get(['content', 'blocks', 0, 'imageUrl']),
- episodeAvailability: getEpisodeAvailability(json),
- episodeTitle: get(['content', 'blocks', 0, 'episodeTitle']),
- recentEpisodes,
- mediaBlocks,
- },
- };
- } catch ({ message, status = getErrorStatusCode() }) {
- return { error: message, status };
- }
-};
diff --git a/src/app/routes/onDemandTV/getInitialData/index.test.js b/src/app/routes/onDemandTV/getInitialData/index.test.js
deleted file mode 100644
index 438a9ded7bd..00000000000
--- a/src/app/routes/onDemandTV/getInitialData/index.test.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import pipe from 'ramda/src/pipe';
-import dissocPath from 'ramda/src/dissocPath';
-import map from 'ramda/src/map';
-import loggerMock from '#testHelpers/loggerMock';
-import onDemandTvJson from '#data/pashto/bbc_pashto_tv/tv_programmes/w13xttn4';
-import { TV_MISSING_FIELD } from '#lib/logger.const';
-import { MEDIA_PAGE } from '#app/routes/utils/pageTypes';
-import * as fetchPageData from '../../utils/fetchPageData';
-import getInitialData from '.';
-
-fetch.mockResponse(JSON.stringify(onDemandTvJson));
-const { env } = process;
-const spy = jest.spyOn(fetchPageData, 'default');
-
-describe('Get initial data for on demand tv', () => {
- afterEach(() => {
- process.env = { ...env };
- jest.clearAllMocks();
- });
-
- it('should return essential data for a page to render', async () => {
- const { pageData } = await getInitialData({
- path: 'mock-on-demand-tv-path',
- pageType: MEDIA_PAGE,
- toggles: {
- recentVideoEpisodes: { enabled: false, value: 4 },
- },
- });
-
- expect(pageData.language).toEqual('ps');
- expect(pageData.releaseDateTimeStamp).toEqual(1726531200000);
- expect(pageData.brandTitle).toEqual(' د بي بي سي خبرونه ');
- expect(pageData.headline).toEqual(' د بي بي سي خبرونه ');
- expect(pageData.shortSynopsis).toEqual(
- 'نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي',
- );
- expect(pageData.promoBrandTitle).toEqual(' د بي بي سي خبرونه ');
- expect(pageData.durationISO8601).toEqual('PT28M');
- expect(pageData.thumbnailImageUrl).toEqual(
- 'https://ichef.bbci.co.uk/images/ic/1024x576/p08b23c8.png',
- );
- });
-
- it('should return essential data for a page to render when the recent episode toggle is null', async () => {
- const { pageData } = await getInitialData({
- path: 'mock-on-demand-tv-path',
- pageType: MEDIA_PAGE,
- toggles: {
- recentVideoEpisodes: null,
- },
- });
-
- expect(pageData.language).toEqual('ps');
- expect(pageData.releaseDateTimeStamp).toEqual(1726531200000);
- expect(pageData.brandTitle).toEqual(' د بي بي سي خبرونه ');
- expect(pageData.headline).toEqual(' د بي بي سي خبرونه ');
- expect(pageData.shortSynopsis).toEqual(
- 'نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي',
- );
- expect(pageData.promoBrandTitle).toEqual(' د بي بي سي خبرونه ');
-
- expect(pageData.durationISO8601).toEqual('PT28M');
- expect(pageData.thumbnailImageUrl).toEqual(
- 'https://ichef.bbci.co.uk/images/ic/1024x576/p08b23c8.png',
- );
- });
-
- it('should return recent episode data when recentEpisode toggle is enabled', async () => {
- const { pageData } = await getInitialData({
- path: 'mock-on-demand-tv-path',
- pageType: MEDIA_PAGE,
- toggles: {
- recentVideoEpisodes: { enabled: true, value: 3 },
- },
- });
-
- expect(pageData.recentEpisodes.length).toEqual(3);
- expect(pageData.recentEpisodes[0].id).toEqual('w172zmsln64wk50');
- });
-
- it('should override renderer on test', async () => {
- process.env.SIMORGH_APP_ENV = 'test';
- await getInitialData({ path: 'mock-live-tv-path', pageType: MEDIA_PAGE });
- expect(spy).toHaveBeenCalledWith({
- path: 'mock-live-tv-path?renderer_env=live',
- pageType: MEDIA_PAGE,
- });
- });
-
- it('should not override renderer on live', async () => {
- process.env.SIMORGH_APP_ENV = 'live';
- await getInitialData({ path: 'mock-live-tv-path', pageType: MEDIA_PAGE });
- expect(spy).toHaveBeenCalledWith({
- path: 'mock-live-tv-path',
- pageType: MEDIA_PAGE,
- });
- });
-
- it('invokes logging when expected data is missing in fetchData response', async () => {
- const errorFields = [
- ['metadata', 'id'],
- ['metadata', 'createdBy'],
- ['content', 'blocks', 0, 'id'],
- ];
-
- const warnFields = [
- ['promo', 'headlines', 'headline'],
- ['metadata', 'releaseDateTimeStamp'],
- ];
-
- const infoFields = [
- ['metadata', 'language'],
- ['metadata', 'title'],
- ['promo', 'media', 'synopses', 'short'],
- ['promo', 'media', 'synopses', 'medium'],
- ['metadata', 'analyticsLabels', 'contentType'],
- ['metadata', 'analyticsLabels', 'pageTitle'],
- ['metadata', 'analyticsLabels', 'pageIdentifier'],
- ['promo', 'media', 'versions', 0, 'durationISO8601'],
- ['promo', 'media', 'imageUrl'],
- ['promo', 'brand', 'title'],
- ['content', 'blocks', 0, 'imageUrl'],
- ['content', 'blocks', 0, 'episodeTitle'],
- ];
-
- const pageDataWithMissingFields = pipe(
- ...map(dissocPath, [...errorFields, ...warnFields, ...infoFields]),
- JSON.stringify,
- )(onDemandTvJson);
-
- fetch.mockResponse(pageDataWithMissingFields);
-
- await getInitialData({
- path: 'mock-on-demand-tv-path',
- pageType: MEDIA_PAGE,
- toggles: {
- recentVideoEpisodes: { enabled: false, value: 4 },
- },
- });
-
- const countMissingFieldCalls = mockedFunction =>
- mockedFunction.mock.calls.filter(
- ([logCategory]) => logCategory === TV_MISSING_FIELD,
- ).length;
-
- expect(countMissingFieldCalls(loggerMock.error)).toBe(errorFields.length);
- expect(countMissingFieldCalls(loggerMock.warn)).toBe(warnFields.length);
- expect(countMissingFieldCalls(loggerMock.info)).toBe(infoFields.length);
- });
-});
diff --git a/src/app/routes/onDemandTV/getInitialData/index.test.ts b/src/app/routes/onDemandTV/getInitialData/index.test.ts
new file mode 100644
index 00000000000..b328cd13b0a
--- /dev/null
+++ b/src/app/routes/onDemandTV/getInitialData/index.test.ts
@@ -0,0 +1,113 @@
+import onDemandTvJson from '#data/pashto/bbc_pashto_tv/tv_programmes/w13xttn4.json';
+import { FetchMock } from 'jest-fetch-mock';
+import { TV_PAGE } from '#app/routes/utils/pageTypes';
+import isTest from '#app/lib/utilities/isTest';
+import * as fetchBFF from '#app/routes/utils/fetchDataFromBFF';
+
+import getInitialData from '.';
+
+const { env } = process;
+const fetchMock = fetch as FetchMock;
+
+jest.mock('#app/lib/utilities/isTest', () =>
+ jest.fn().mockImplementation(() => false),
+);
+
+const pageType = TV_PAGE;
+
+describe('Get initial data for on demand tv', () => {
+ beforeEach(() => {
+ fetchMock.mockResponse(JSON.stringify(onDemandTvJson));
+ });
+
+ afterEach(() => {
+ process.env = { ...env };
+ jest.clearAllMocks();
+ });
+
+ it('should return essential data for a page to render', async () => {
+ const { pageData } = await getInitialData({
+ path: 'mock-on-demand-tv-path',
+ service: 'pashto',
+ pageType,
+ toggles: {
+ recentVideoEpisodes: { enabled: false, value: 4 },
+ },
+ });
+
+ expect(pageData.language).toEqual('ps');
+ expect(pageData.releaseDateTimeStamp).toEqual('2024-11-21T00:00:00.000Z');
+ expect(pageData.brandTitle).toEqual(' د بي بي سي خبرونه ');
+ expect(pageData.headline).toEqual(' د بي بي سي خبرونه ');
+ expect(pageData.shortSynopsis).toEqual(
+ 'نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي\n',
+ );
+ expect(pageData.promoBrandTitle).toEqual(' د بي بي سي خبرونه ');
+ expect(pageData.durationISO8601).toEqual('PT28M');
+ expect(pageData.thumbnailImageUrl).toEqual(
+ 'https://ichef.bbci.co.uk/images/ic/1024x576/p0k5s1yz.png',
+ );
+ });
+
+ it('should return no recent episode data when the recent episode toggle is null', async () => {
+ const { pageData } = await getInitialData({
+ path: 'mock-on-demand-tv-path',
+ pageType,
+ toggles: {
+ // @ts-expect-error allow toggle value to be null for testing purposes
+ recentVideoEpisodes: null,
+ },
+ });
+
+ expect(pageData.recentEpisodes).toBeNull();
+ });
+
+ it('should return no recent episode data when recentEpisode toggle is disabled and value is greater than zero', async () => {
+ const { pageData } = await getInitialData({
+ path: 'mock-on-demand-tv-path',
+ service: 'pashto',
+ pageType,
+ toggles: {
+ recentVideoEpisodes: { enabled: false, value: 3 },
+ },
+ });
+
+ expect(pageData.recentEpisodes).toBeNull();
+ });
+
+ it('should return recent episode data when recentEpisode toggle is enabled', async () => {
+ const { pageData } = await getInitialData({
+ path: 'mock-on-demand-tv-path',
+ service: 'pashto',
+ pageType,
+ toggles: {
+ recentVideoEpisodes: { enabled: true, value: 3 },
+ },
+ });
+
+ expect(pageData.recentEpisodes).toHaveLength(3);
+ expect(pageData.recentEpisodes[0].id).toEqual('w172zmspxm02pfr');
+ });
+
+ it.each`
+ isTestEnvironment | expectedPathname
+ ${true} | ${'mock-on-demand-tv-path?renderer_env=live'}
+ ${false} | ${'mock-on-demand-tv-path'}
+ `(
+ 'should fetch from $expectedPathname when test environment is $isTestEnvironment',
+ async ({ isTestEnvironment, expectedPathname }) => {
+ (isTest as jest.Mock).mockImplementationOnce(() => isTestEnvironment);
+ const fetchBFFSpy = jest.spyOn(fetchBFF, 'default');
+
+ await getInitialData({
+ path: 'mock-on-demand-tv-path',
+ pageType: TV_PAGE,
+ service: 'gahuza',
+ });
+
+ expect(fetchBFFSpy).toHaveBeenCalledWith(
+ expect.objectContaining({ pathname: expectedPathname }),
+ );
+ },
+ );
+});
diff --git a/src/app/routes/onDemandTV/getInitialData/index.ts b/src/app/routes/onDemandTV/getInitialData/index.ts
new file mode 100644
index 00000000000..32faf47e947
--- /dev/null
+++ b/src/app/routes/onDemandTV/getInitialData/index.ts
@@ -0,0 +1,66 @@
+import fetchDataFromBFF from '#app/routes/utils/fetchDataFromBFF';
+import { InitialDataProps } from '#app/models/types/initialData';
+import handleError from '#app/routes/utils/handleError';
+import { BFF_FETCH_ERROR } from '#app/lib/logger.const';
+import nodeLogger from '#app/lib/logger.node';
+import { FetchError } from '#app/models/types/fetch';
+import { TV_PAGE } from '#app/routes/utils/pageTypes';
+import isTest from '#app/lib/utilities/isTest';
+import overrideRendererOnTest from '#app/routes/utils/overrideRendererOnTest';
+
+const logger = nodeLogger(__filename);
+
+export default async ({
+ service,
+ variant,
+ path: pathname,
+ getAgent,
+ toggles,
+}: InitialDataProps) => {
+ try {
+ const { status, json } = await fetchDataFromBFF({
+ pathname: isTest() ? overrideRendererOnTest(pathname) : pathname,
+ service,
+ variant,
+ pageType: TV_PAGE,
+ getAgent,
+ });
+
+ if (!json?.data) {
+ throw handleError('On Demand TV data is malformed', 500);
+ }
+
+ const data = json?.data;
+
+ const maxRecentEpisodes =
+ // @ts-expect-error recentVideoEpisodes does exist on the toggles object
+ toggles?.recentVideoEpisodes?.enabled
+ ? // @ts-expect-error recentVideoEpisodes does exist on the toggles object
+ toggles?.recentVideoEpisodes?.value || 4
+ : 0;
+
+ const recentEpisodes =
+ maxRecentEpisodes > 0
+ ? data.recentEpisodes.slice(0, maxRecentEpisodes)
+ : null;
+
+ return {
+ status,
+ pageData: {
+ ...data,
+ recentEpisodes,
+ },
+ };
+ } catch (error: unknown) {
+ const { message, status } = error as FetchError;
+
+ logger.error(BFF_FETCH_ERROR, {
+ service,
+ status,
+ pathname,
+ message,
+ });
+
+ return { error: message, status };
+ }
+};
diff --git a/src/app/routes/onDemandTV/index.js b/src/app/routes/onDemandTV/index.js
index fea4a91eda6..067f27aa237 100644
--- a/src/app/routes/onDemandTV/index.js
+++ b/src/app/routes/onDemandTV/index.js
@@ -1,6 +1,6 @@
import { OnDemandTvPage } from '#pages';
import { onDemandTvPath } from '#app/routes/utils/regex';
-import { MEDIA_PAGE } from '#app/routes/utils/pageTypes';
+import { TV_PAGE } from '#app/routes/utils/pageTypes';
import getInitialData from './getInitialData';
export default {
@@ -8,5 +8,5 @@ export default {
exact: true,
component: OnDemandTvPage,
getInitialData,
- pageType: MEDIA_PAGE,
+ pageType: TV_PAGE,
};
diff --git a/src/app/routes/utils/constructPageFetchUrl/index.test.ts b/src/app/routes/utils/constructPageFetchUrl/index.test.ts
index 431575dc70a..b53147bf4e0 100644
--- a/src/app/routes/utils/constructPageFetchUrl/index.test.ts
+++ b/src/app/routes/utils/constructPageFetchUrl/index.test.ts
@@ -5,6 +5,7 @@ import {
HOME_PAGE,
LIVE_PAGE,
TOPIC_PAGE,
+ TV_PAGE,
UGC_PAGE,
} from '../pageTypes';
@@ -121,6 +122,12 @@ describe('constructPageFetchUrl', () => {
${TOPIC_PAGE} | ${'persian'} | ${null} | ${'test'} | ${'/persian/topics/c00000000000t'} | ${'https://mock-bff-path/?id=c00000000000t&service=persian&pageType=topic&serviceEnv=test'}
${TOPIC_PAGE} | ${'persian'} | ${null} | ${'live'} | ${'/persian/topics/c00000000000t'} | ${'https://mock-bff-path/?id=c00000000000t&service=persian&pageType=topic&serviceEnv=live'}
${UGC_PAGE} | ${'mundo'} | ${null} | ${'local'} | ${'/u50853489'} | ${'http://localhost/api/local/mundo/send/u50853489'}
+ ${TV_PAGE} | ${'hausa'} | ${null} | ${'local'} | ${'/hausa/bbc_hausa_tv/tv/w172yjj7rfhxp1p'} | ${'http://localhost/hausa/bbc_hausa_tv/tv/w172yjj7rfhxp1p'}
+ ${TV_PAGE} | ${'hindi'} | ${null} | ${'local'} | ${'/hindi/bbc_hindi_tv/tv_programmes/w13xttlw'} | ${'http://localhost/hindi/bbc_hindi_tv/tv_programmes/w13xttlw'}
+ ${TV_PAGE} | ${'hausa'} | ${null} | ${'test'} | ${'/hausa/bbc_hausa_tv/tv/w172yjj7rfhxp1p'} | ${'https://mock-bff-path/?id=hausa%2Fbbc_hausa_tv%2Ftv%2Fw172yjj7rfhxp1p&service=hausa&pageType=tv&serviceEnv=test'}
+ ${TV_PAGE} | ${'hindi'} | ${null} | ${'test'} | ${'/hindi/bbc_hindi_tv/tv_programmes/w13xttlw'} | ${'https://mock-bff-path/?id=hindi%2Fbbc_hindi_tv%2Ftv_programmes%2Fw13xttlw&service=hindi&pageType=tv&serviceEnv=test'}
+ ${TV_PAGE} | ${'hausa'} | ${null} | ${'live'} | ${'/hausa/bbc_hausa_tv/tv/w172yjj7rfhxp1p'} | ${'https://mock-bff-path/?id=hausa%2Fbbc_hausa_tv%2Ftv%2Fw172yjj7rfhxp1p&service=hausa&pageType=tv&serviceEnv=live'}
+ ${TV_PAGE} | ${'hindi'} | ${null} | ${'live'} | ${'/hindi/bbc_hindi_tv/tv_programmes/w13xttlw'} | ${'https://mock-bff-path/?id=hindi%2Fbbc_hindi_tv%2Ftv_programmes%2Fw13xttlw&service=hindi&pageType=tv&serviceEnv=live'}
`(
`on $environment environment, should return $expected when path is $pathname, pageType is $pageType, service is $serviceOverride and variant is $variant`,
({
diff --git a/src/app/routes/utils/constructPageFetchUrl/index.ts b/src/app/routes/utils/constructPageFetchUrl/index.ts
index eb38060e83a..fce50d9066d 100644
--- a/src/app/routes/utils/constructPageFetchUrl/index.ts
+++ b/src/app/routes/utils/constructPageFetchUrl/index.ts
@@ -24,6 +24,7 @@ import {
MOST_READ_PAGE,
AUDIO_PAGE,
TOPIC_PAGE,
+ TV_PAGE,
UGC_PAGE,
} from '../pageTypes';
import parseAvRoute from '../parseAvRoute';
@@ -32,6 +33,7 @@ const removeLeadingSlash = (path: string) => path?.replace(/^\/+/g, '');
const removeAmp = (path: string) => path.split('.')[0];
const getArticleId = (path: string) => path.match(/(c[a-zA-Z0-9]{10,}o)/)?.[1];
const getCpsId = (path: string) => removeLeadingSlash(path);
+const getTVAudioId = (path: string) => removeLeadingSlash(path);
const getFrontPageId = (path: string) =>
`${removeLeadingSlash(path)}/front_page`;
const getTipoId = (path: string) => path.match(/(c[a-zA-Z0-9]{10,}t)/)?.[1];
@@ -135,9 +137,8 @@ const getId = ({ pageType, service, variant, env }: GetIdProps) => {
};
break;
case AUDIO_PAGE:
- getIdFunction = (path: string) => {
- return path;
- };
+ case TV_PAGE:
+ getIdFunction = (path: string) => getTVAudioId(path);
break;
default:
getIdFunction = () => null;
@@ -219,6 +220,8 @@ const constructPageFetchUrl = ({
break;
}
case CPS_ASSET:
+ case AUDIO_PAGE:
+ case TV_PAGE:
fetchUrl = Url(`/${id}`);
break;
case HOME_PAGE: {
@@ -265,10 +268,6 @@ const constructPageFetchUrl = ({
}
break;
}
- case AUDIO_PAGE: {
- fetchUrl = Url(pathname);
- break;
- }
default:
return fetchUrl;
}
diff --git a/src/app/routes/utils/pageTypes.ts b/src/app/routes/utils/pageTypes.ts
index f2c59a47ca3..289f8274073 100644
--- a/src/app/routes/utils/pageTypes.ts
+++ b/src/app/routes/utils/pageTypes.ts
@@ -18,3 +18,4 @@ export const UGC_PAGE = 'ugcForm' as const;
export const AV_EMBEDS = 'avEmbeds' as const;
export const DOWNLOADS_PAGE = 'downloads' as const;
export const AUDIO_PAGE = 'audio' as const;
+export const TV_PAGE = 'tv' as const;
diff --git a/src/app/routes/utils/processRecentEpisodes/index.jsx b/src/app/routes/utils/processRecentEpisodes/index.jsx
deleted file mode 100644
index 3eea38ba9e1..00000000000
--- a/src/app/routes/utils/processRecentEpisodes/index.jsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import path from 'ramda/src/path';
-import is from 'ramda/src/is';
-
-const validateEpisode = episode => {
- try {
- const checks = [
- episode,
- is(String, episode.id),
- episode.id.includes(':'),
- episode.brand,
- is(String, episode.brand.title),
- episode.media,
- is(String, episode.media.id),
- episode.media.versions[0],
- is(String, episode.media.versions[0].durationISO8601),
- is(Number, episode.releaseDateTimestamp),
- ];
-
- return checks.every(Boolean);
- } catch {
- return false;
- }
-};
-
-const formatEpisode = episode => ({
- id: episode.media.id,
- brandTitle: episode.brand.title,
- episodeTitle: episode.media.episodeTitle,
- timestamp: episode.releaseDateTimestamp,
- duration: episode.media.versions[0].durationISO8601,
- image: `//${episode.media.imageUrl.replace('$recipe', '768x432')}`,
- altText: episode.brand.title,
-});
-
-const excludeEpisode = idToExclude => episode =>
- episode.media.id !== idToExclude;
-
-const processRecentEpisodes = (
- pageData,
- { recentEpisodesLimit = 4, exclude = null } = {},
-) =>
- path(['relatedContent', 'groups', 0, 'promos'], pageData)
- .filter(validateEpisode)
- .filter(excludeEpisode(exclude))
- .map(formatEpisode)
- .slice(0, recentEpisodesLimit);
-
-export default processRecentEpisodes;
diff --git a/src/app/routes/utils/processRecentEpisodes/index.test.jsx b/src/app/routes/utils/processRecentEpisodes/index.test.jsx
deleted file mode 100644
index 3ab67c96bc0..00000000000
--- a/src/app/routes/utils/processRecentEpisodes/index.test.jsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import assocPath from 'ramda/src/assocPath';
-import videoPageData from '#data/afrique/bbc_afrique_tv/tv_programmes/w13xttmz.json';
-import processRecentEpisodes from '.';
-
-describe('processRecentEpisodes', () => {
- it('should correctly format TV episodes using a custom URL formatter', () => {
- expect(
- processRecentEpisodes(videoPageData, {
- recentEpisodesLimit: 1,
- enabled: true,
- urlFormatter: (service, id) =>
- `/${service}/${id.split(':').pop().replace('/', '/tv/')}`,
- }),
- ).toEqual([
- {
- id: 'w172yj93rrkg6r7',
- brandTitle: 'BBC Info',
- episodeTitle: 'BBC Info',
- timestamp: 1679011200000,
- duration: 'PT15M',
- image: '//ichef.bbci.co.uk/images/ic/768x432/p08b22y1.png',
- altText: 'BBC Info',
- },
- ]);
- });
-
- it('should correctly output multiple episodes', () => {
- expect(
- processRecentEpisodes(videoPageData, {
- recentEpisodesLimit: 3,
- enabled: true,
- }).length,
- ).toEqual(3);
- });
-
- it('should correctly exclude episodes by id', () => {
- const episodeCountInPageData =
- videoPageData.relatedContent.groups[0].promos.length;
- const firstId = videoPageData.relatedContent.groups[0].promos[0].media.id;
- expect(
- processRecentEpisodes(videoPageData, {
- recentEpisodesLimit: episodeCountInPageData,
- exclude: firstId,
- enabled: true,
- }).length,
- ).toEqual(episodeCountInPageData - 1);
- });
-});
-
-it('should correctly handle episodes with missing versions', () => {
- const episodeCountInPageData =
- videoPageData.relatedContent.groups[0].promos.length;
- const pageWithMissingVersions = assocPath(
- ['relatedContent', 'groups', 0, 'promos', 0, 'media', 'versions'],
- [],
- videoPageData,
- );
- expect(
- processRecentEpisodes(pageWithMissingVersions, {
- recentEpisodesLimit: episodeCountInPageData,
- enabled: true,
- }).length,
- ).toEqual(episodeCountInPageData - 1);
-});
diff --git a/src/integration/pages/onDemandTVPage/hausa/__snapshots__/canonical.test.js.snap b/src/integration/pages/onDemandTVPage/hausa/__snapshots__/canonical.test.js.snap
index 54a8a531ae7..0dd7139d413 100644
--- a/src/integration/pages/onDemandTVPage/hausa/__snapshots__/canonical.test.js.snap
+++ b/src/integration/pages/onDemandTVPage/hausa/__snapshots__/canonical.test.js.snap
@@ -22,10 +22,10 @@ exports[`Canonical On Demand T V Page Analytics ATI tracking pixel search params
"s2": "51",
},
{
- "p": "hausa.bbc_hausa_tv.tv.w172xcg0kg6vph8.page",
+ "p": "hausa.bbc_hausa_tv.tv.w172yjj7rfhxp1p.page",
},
{
- "x1": "[urn:bbc:pips:w172xcg0kg6vph8]",
+ "x1": "[urn:bbc:pips:w172yjj7rfhxp1p]",
},
{
"x2": "[responsive]",
@@ -170,11 +170,11 @@ exports[`Canonical On Demand T V Page I can see the brand title 1`] = `"Labaran
exports[`Canonical On Demand T V Page I can see the episode summary 1`] = `"Sashen Hausa na BBC ya fara gabatar da shirin talabijin a ranakun Litinin zuwa Juma'a na kowane mako."`;
-exports[`Canonical On Demand T V Page I can see the episode title 1`] = `"23 Nuwamba 2020"`;
+exports[`Canonical On Demand T V Page I can see the episode title 1`] = `"Labaran Talabijin"`;
-exports[`Canonical On Demand T V Page Main heading should match text 1`] = `"Labaran Talabijin, 23 Nuwamba 2020"`;
+exports[`Canonical On Demand T V Page Main heading should match text 1`] = `"Labaran Talabijin, 17 Maris 2023"`;
-exports[`Canonical On Demand T V Page Media Loader a11y assistive technology can read the media player title 1`] = `"Play video, "", Tsawon lokaci 10,00"`;
+exports[`Canonical On Demand T V Page Media Loader a11y assistive technology can read the media player title 1`] = `"Play video, "Labaran Talabijin", Tsawon lokaci 10,00"`;
exports[`Canonical On Demand T V Page Media Loader renders a figure caption 1`] = `
- Play video, "", Tsawon lokaci 10,00
+ Play video, "Labaran Talabijin", Tsawon lokaci 10,00
- Play video, "", Tsawon lokaci 10,00
+ Play video, "Labaran Talabijin", Tsawon lokaci 10,00
- Play video, "", Tsawon lokaci 10,00
+ Play video, "Labaran Talabijin", Tsawon lokaci 10,00
@@ -344,8 +347,8 @@ exports[`Canonical On Demand T V Page Media Loader renders a placeholder 1`] = `
@@ -422,8 +425,8 @@ exports[`Canonical On Demand T V Page Media Loader renders a valid container 1`]
@@ -433,29 +436,29 @@ exports[`Canonical On Demand T V Page Media Loader renders a valid container 1`]
exports[`Canonical On Demand T V Page Recent Episodes List items should match text and url 1`] = `
{
- "text": "۲۸:۰۰ویډیو, د بي بي سي خبرونه , د بي بي سي خبرونه , موده ۲۸،۰۰ ۱۶ سپتمبر ۲۰۲۴",
- "url": "/pashto/bbc_pashto_tv/tv/w172zmsln64wk50",
+ "text": "۲۸:۰۰ویډیو, د بي بي سي خبرونه , د بي بي سي خبرونه , موده ۲۸،۰۰ ۲۰ نومبر ۲۰۲۴",
+ "url": "/pashto/bbc_pashto_tv/tv/w172zmspxm02pfr",
}
`;
exports[`Canonical On Demand T V Page Recent Episodes List items should match text and url 2`] = `
{
- "text": "۲۸:۰۰ویډیو, د بي بي سي خبرونه , د بي بي سي خبرونه , موده ۲۸،۰۰ ۱۵ سپتمبر ۲۰۲۴",
- "url": "/pashto/bbc_pashto_tv/tv/w172zmsl8xvnszr",
+ "text": "۲۸:۰۰ویډیو, د بي بي سي خبرونه , د بي بي سي خبرونه , موده ۲۸،۰۰ ۱۹ نومبر ۲۰۲۴",
+ "url": "/pashto/bbc_pashto_tv/tv/w172zmspxlzzsjn",
}
`;
exports[`Canonical On Demand T V Page Recent Episodes List items should match text and url 3`] = `
{
- "text": "۲۸:۰۰ویډیو, د بي بي سي خبرونه , د بي بي سي خبرونه , موده ۲۸،۰۰ ۱۴ سپتمبر ۲۰۲۴",
- "url": "/pashto/bbc_pashto_tv/tv/w172zmsl8xvkx2n",
+ "text": "۲۸:۰۰ویډیو, د بي بي سي خبرونه , د بي بي سي خبرونه , موده ۲۸،۰۰ ۱۸ نومبر ۲۰۲۴",
+ "url": "/pashto/bbc_pashto_tv/tv/w172zmspxlzwwmk",
}
`;
exports[`Canonical On Demand T V Page Recent Episodes List items should match text and url 4`] = `
{
- "text": "۲۸:۰۰ویډیو, د بي بي سي خبرونه , د بي بي سي خبرونه , موده ۲۸،۰۰ ۱۳ سپتمبر ۲۰۲۴",
- "url": "/pashto/bbc_pashto_tv/tv/w172zmsl8xvh05k",
+ "text": "۲۸:۰۰ویډیو, د بي بي سي خبرونه , د بي بي سي خبرونه , موده ۲۸،۰۰ ۱۵ نومبر ۲۰۲۴",
+ "url": "/pashto/bbc_pashto_tv/tv/w172zmspkbphbn3",
}
`;
@@ -535,7 +538,7 @@ exports[`Canonical On Demand T V Page SEO Dir attribute 1`] = `"rtl"`;
exports[`Canonical On Demand T V Page SEO FB app ID 1`] = `"1609039196070050"`;
-exports[`Canonical On Demand T V Page SEO Heading level 1 1`] = `" د بي بي سي خبرونه , ۱۷ سپتمبر ۲۰۲۴"`;
+exports[`Canonical On Demand T V Page SEO Heading level 1 1`] = `" د بي بي سي خبرونه , ۲۱ نومبر ۲۰۲۴"`;
exports[`Canonical On Demand T V Page SEO Lang attribute 1`] = `"ps"`;
@@ -577,17 +580,21 @@ exports[`Canonical On Demand T V Page SEO Linked data should match text 1`] = `
},
{
"@type": "VideoObject",
- "description": "نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي",
+ "description": "نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي
+",
"duration": "PT28M",
"name": " د بي بي سي خبرونه ",
- "thumbnailUrl": "https://ichef.bbci.co.uk/images/ic/1024x576/p08b23c8.png",
- "uploadDate": "2024-09-17T00:00:00.000Z",
+ "thumbnailUrl": "https://ichef.bbci.co.uk/images/ic/1024x576/p0k5s1yz.png",
+ "uploadDate": "2024-11-21T00:00:00.000Z",
},
],
}
`;
-exports[`Canonical On Demand T V Page SEO OG description 1`] = `"نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي"`;
+exports[`Canonical On Demand T V Page SEO OG description 1`] = `
+"نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي
+"
+`;
exports[`Canonical On Demand T V Page SEO OG image 1`] = `"https://news.files.bbci.co.uk/ws/img/logos/og/pashto.png"`;
@@ -611,7 +618,10 @@ exports[`Canonical On Demand T V Page SEO Twitter card 1`] = `"summary_large_ima
exports[`Canonical On Demand T V Page SEO Twitter creator 1`] = `"@bbcpashto"`;
-exports[`Canonical On Demand T V Page SEO Twitter description 1`] = `"نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي"`;
+exports[`Canonical On Demand T V Page SEO Twitter description 1`] = `
+"نړۍ دا وخت، د نړۍ او سیمې وروستۍ پرمختیاوې یادوي
+"
+`;
exports[`Canonical On Demand T V Page SEO Twitter image alt 1`] = `"BBC News پښتو"`;
@@ -621,4 +631,4 @@ exports[`Canonical On Demand T V Page SEO Twitter site 1`] = `"@bbcpashto"`;
exports[`Canonical On Demand T V Page SEO Twitter title 1`] = `" د بي بي سي خبرونه - د بي بي سي خبرونه - BBC News پښتو - BBC News پښتو"`;
-exports[`Canonical On Demand T V Page a11y Assistive technology reads the brand and episode title as the headline 1`] = `" د بي بي سي خبرونه , ۱۷ سپتمبر ۲۰۲۴"`;
+exports[`Canonical On Demand T V Page a11y Assistive technology reads the brand and episode title as the headline 1`] = `" د بي بي سي خبرونه , ۲۱ نومبر ۲۰۲۴"`;
diff --git a/src/server/index.test.jsx b/src/server/index.test.jsx
index 558e088adbc..6db898eb9d3 100644
--- a/src/server/index.test.jsx
+++ b/src/server/index.test.jsx
@@ -1086,7 +1086,7 @@ describe('Server', () => {
'/pashto/bbc_pashto_tv/tv_programmes/w13xttn4.json',
);
expect(body).toEqual(
- expect.objectContaining({ content: expect.any(Object) }),
+ expect.objectContaining({ data: expect.any(Object) }),
);
});
