WS-222: [CANONICAL] - Delete dead/unused ATI code in Simorgh

cypress/e2e/pages/liveRadio/index.cy.js

@@ -115,7 +115,6 @@ const atiAnalyticsTestSuites = [
     siteId: 51,
     applicationType: 'responsive',
     contentType: 'player-live',
-    useReverb: true,
     tests: [
       assertPageView,
       assertRadioScheduleComponentView,

cypress/e2e/pages/mostReadPage/index.cy.js

@@ -86,7 +86,6 @@ const atiAnalyticsTestSuites = [
     siteId: 40,
     applicationType: 'responsive',
     contentType: 'list-datadriven',
-    useReverb: true,
     tests: [
       assertPageView,
       assertDropdownNavigationComponentClick,
@@ -103,7 +102,6 @@ const atiAnalyticsAmpTestSuites = atiAnalyticsTestSuites.map(testSuite => {
   return {
     ...testSuite,
     path: getPathWithSuffix({ path: testSuite.path, suffix: '.amp' }),
-    useReverb: true,
     applicationType: 'amp',
     tests: [assertPageView],
   };
@@ -126,7 +124,6 @@ const atiAnalyticsLiteTestSuites = atiAnalyticsTestSuites.map(testSuite => {
     ...testSuite,
     path: getPathWithSuffix({ path: testSuite.path, suffix: '.lite' }),
     applicationType: 'lite',
-    useReverb: true,
     tests: [...liteSiteTests],
   };
 });

cypress/e2e/pages/onDemandAudio/index.cy.js

@@ -466,7 +466,6 @@ const atiAnalyticsTestSuites = [
     siteId: 3,
     applicationType: 'responsive',
     contentType: 'player-episode',
-    useReverb: true,
     tests: [
       assertPageView,
       assertRecentAudioEpisodesComponentView,
@@ -483,7 +482,6 @@ const atiAnalyticsTestSuites = [
     siteId: 5,
     applicationType: 'responsive',
     contentType: 'player-episode',
-    useReverb: true,
     tests: [assertPageView],
   },
   {
@@ -494,7 +492,6 @@ const atiAnalyticsTestSuites = [
     siteId: 40,
     applicationType: 'responsive',
     contentType: 'player-episode',
-    useReverb: true,
     tests: [...atiAnalyticsPodcastComponentTests],
   },
   {
@@ -505,7 +502,6 @@ const atiAnalyticsTestSuites = [
     siteId: 40,
     applicationType: 'responsive',
     contentType: 'player-episode',
-    useReverb: true,
     tests: [...atiAnalyticsPodcastComponentTests],
   },
   {
@@ -516,7 +512,6 @@ const atiAnalyticsTestSuites = [
     siteId: 33,
     applicationType: 'responsive',
     contentType: 'player-episode',
-    useReverb: true,
     tests: [...atiAnalyticsPodcastComponentTests],
   },
   {
@@ -527,7 +522,6 @@ const atiAnalyticsTestSuites = [
     siteId: 33,
     applicationType: 'responsive',
     contentType: 'player-episode',
-    useReverb: true,
     tests: [...atiAnalyticsPodcastComponentTests],
   },
   {
@@ -539,7 +533,6 @@ const atiAnalyticsTestSuites = [
     siteId: 94,
     applicationType: 'responsive',
     contentType: 'player-episode',
-    useReverb: true,
     tests: [...atiAnalyticsPodcastComponentTests],
   },
 ];
@@ -561,7 +554,6 @@ const atiAnalyticsLiteTestSuites = atiAnalyticsTestSuites.map(testSuite => {
     ...testSuite,
     path: getPathWithSuffix({ path: testSuite.path, suffix: '.lite' }),
     applicationType: 'lite',
-    useReverb: false,
     siteId: testSuite.siteId,
     tests: [...liteSiteTests],
   };

cypress/e2e/pages/onDemandTV/index.cy.js

@@ -211,7 +211,6 @@ const atiAnalyticsTestSuites = [
     siteId: 3,
     applicationType: 'responsive',
     contentType: 'player-episode',
-    useReverb: true,
     tests: [assertPageView],
   },
   {
@@ -222,7 +221,6 @@ const atiAnalyticsTestSuites = [
     siteId: 3,
     applicationType: 'responsive',
     contentType: 'player-episode',
-    useReverb: true,
     tests: [assertPageView],
   },
 ];
@@ -252,7 +250,6 @@ const atiAnalyticsLiteTestSuites = atiAnalyticsTestSuites.map(testSuite => {
     ...testSuite,
     path: getPathWithSuffix({ path: testSuite.path, suffix: '.lite' }),
     applicationType: 'lite',
-    useReverb: false,
     siteId: testSuite.siteId,
     tests: [...liteSiteTests],
   };

cypress/e2e/pages/topicPage/index.cy.js

@@ -87,7 +87,6 @@ const atiAnalyticsTestSuites = [
     siteId: 59,
     applicationType: 'responsive',
     contentType: 'index-category',
-    useReverb: true,
     componentTrackingContentType: 'topic-page',
     tests: [assertPageView],
   },
@@ -100,7 +99,6 @@ const atiAnalyticsTestSuites = [
     applicationType: 'responsive',
     contentType: 'index-category',
     componentTrackingContentType: 'topic-page',
-    useReverb: true,
     tests: [
       assertPageView,
       assertScrollableNavigationComponentView,
@@ -130,7 +128,6 @@ const atiAnalyticsLiteTestSuites = atiAnalyticsTestSuites.map(testSuite => {
     ...testSuite,
     path: getPathWithSuffix({ path: testSuite.path, suffix: '.lite' }),
     applicationType: 'lite',
-    useReverb: false,
     siteId: testSuite.siteId,
     tests: [...liteSiteTests],
   };

cypress/e2e/specialFeatures/atiAnalytics/assertions/articleLiteSiteLink.js

@@ -6,7 +6,6 @@ const { ARTICLE_LITE_SITE_LINK } = COMPONENTS;
 export const assertArticleLiteSiteLinkComponentView = ({
   pageIdentifier,
   contentType,
-  useReverb,
   path,
   applicationType,
   siteId,
@@ -23,7 +22,6 @@ export const assertArticleLiteSiteLinkComponentView = ({
       component: ARTICLE_LITE_SITE_LINK,
       pageIdentifier,
       contentType,
-      useReverb,
       applicationType,
       siteId,
     });
@@ -33,7 +31,6 @@ export const assertArticleLiteSiteLinkComponentView = ({
 export const assertArticleLiteSiteLinkComponentClick = ({
   pageIdentifier,
   contentType,
-  useReverb,
   path,
   applicationType,
   siteId,
@@ -53,7 +50,6 @@ export const assertArticleLiteSiteLinkComponentClick = ({
       component: ARTICLE_LITE_SITE_LINK,
       pageIdentifier,
       contentType,
-      useReverb,
       applicationType,
       siteId,
     });

cypress/e2e/specialFeatures/atiAnalytics/assertions/featuresAnalysis.js

@@ -6,7 +6,6 @@ const { FEATURES } = COMPONENTS;
 export const assertFeaturesAnalysisComponentView = ({
   pageIdentifier,
   contentType,
-  useReverb,
   path,
   applicationType,
   siteId,
@@ -21,7 +20,6 @@ export const assertFeaturesAnalysisComponentView = ({
       component: FEATURES,
       pageIdentifier,
       contentType,
-      useReverb,
       applicationType,
       siteId,
     });
@@ -31,7 +29,6 @@ export const assertFeaturesAnalysisComponentView = ({
 export const assertFeaturesAnalysisComponentClick = ({
   pageIdentifier,
   contentType,
-  useReverb,
   path,
   applicationType,
   siteId,
@@ -49,7 +46,6 @@ export const assertFeaturesAnalysisComponentClick = ({
       component: FEATURES,
       pageIdentifier,
       contentType,
-      useReverb,
       applicationType,
       siteId,
     });

cypress/e2e/specialFeatures/atiAnalytics/assertions/index.js

@@ -6,15 +6,15 @@ import {
 import {
   ATI_PAGE_VIEW,
   ATI_PAGE_VIEW_REVERB,
-  // ATI_USER_ID_COOKIE,
+  ATI_USER_ID_COOKIE,
   getATIParamsFromURL,
   interceptATIAnalyticsBeacons,
   getExpectedAtiDestination,
 } from '../helpers';
 import environment from '../../../../support/helpers/getAppEnv';
 
 const usesReverbViewabilityModel = applicationType =>
-  applicationType !== 'lite';
+  !['lite', 'amp'].includes(applicationType);
 
 const getAppName = service => {
   if (service === 'ws') {
@@ -93,7 +93,14 @@ const assertLocationSpecificPianoDestinationExists = ({ service }) => {
   });
 };
 
-const assertReverbViewabilityComponentEventParamsExist = ({ params }) => {
+const assertReverbViewabilityComponentEventParamsExist = ({
+  params,
+  applicationType,
+}) => {
+  if (['responsive', 'lite'].includes(applicationType)) {
+    expect(params).to.have.property('idclient');
+  }
+
   expect(params).to.have.property('s'); // destination
   expect(params).to.have.property('events'); // event details
   expect(params).to.have.property('context');
@@ -183,7 +190,6 @@ const validateViewabilityEventDetails = ({ payload, actionType }) => {
 };
 
 export const assertPageView = ({
-  useReverb,
   pageIdentifier,
   applicationType,
   contentType,
@@ -196,10 +202,9 @@ export const assertPageView = ({
     cy.visit(path, { retryOnStatusCodeFailure: true });
 
     const useViewabilty = usesReverbViewabilityModel(applicationType);
-    const atiPageViewAlias =
-      useReverb && useViewabilty && applicationType !== 'amp'
-        ? ATI_PAGE_VIEW_REVERB
-        : ATI_PAGE_VIEW;
+    const atiPageViewAlias = useViewabilty
+      ? ATI_PAGE_VIEW_REVERB
+      : ATI_PAGE_VIEW;
 
     cy.wait(`@${atiPageViewAlias}`).then(({ request }) => {
       const params = getATIParamsFromURL(request.url);
@@ -210,13 +215,12 @@ export const assertPageView = ({
         applicationType,
       });
 
-      // TODO: Commenting out temporarily until old ATI code is removed - https://bbc.atlassian.net/browse/WS-222
-      // if (['responsive', 'lite'].includes(applicationType)) {
-      //   expect(params.idclient).to.equal(
-      //     ATI_USER_ID_COOKIE,
-      //     'params.idclient (atuserid cookie value)',
-      //   );
-      // }
+      if (['responsive', 'lite'].includes(applicationType)) {
+        expect(params.idclient).to.equal(
+          ATI_USER_ID_COOKIE,
+          'params.idclient (atuserid cookie value)',
+        );
+      }
 
       expect(params.p).to.equal(pageIdentifier, 'params.p (page identifier)');
       expect(parseInt(params.s2, 10)).to.equal(
@@ -246,20 +250,12 @@ export const assertPageView = ({
 const assertViewabilityModelViewEvent = ({
   pageIdentifier,
   params,
-  // applicationType,
+  applicationType,
   siteId,
 }) => {
   const eventContext = JSON.parse(params.context);
 
-  assertReverbViewabilityComponentEventParamsExist({ params });
-
-  // TODO: Commenting out temporarily until old ATI code is removed - https://bbc.atlassian.net/browse/WS-222
-  // if (['responsive', 'lite'].includes(applicationType)) {
-  //   expect(params.idclient).to.equal(
-  //     ATI_USER_ID_COOKIE,
-  //     'params.idclient (atuserid cookie value)',
-  //   );
-  // }
+  assertReverbViewabilityComponentEventParamsExist({ params, applicationType });
 
   expect(params.events).to.satisfy(
     payload =>
@@ -275,6 +271,7 @@ export const assertATIComponentViewEvent = ({
   component,
   pageIdentifier,
   contentType,
+  applicationType,
   siteId,
 }) => {
   const requestAlias = `@${component}-viewability-view`;
@@ -289,6 +286,7 @@ export const assertATIComponentViewEvent = ({
         pageIdentifier,
         contentType,
         params,
+        applicationType,
         siteId,
       });
     });
@@ -297,23 +295,16 @@ export const assertATIComponentViewEvent = ({
 const assertViewabilityModelClickEvent = ({
   pageIdentifier,
   params,
-  // applicationType,
+  applicationType,
   siteId,
 }) => {
   const eventContext = JSON.parse(params.context);
 
   assertReverbViewabilityComponentEventParamsExist({
     params,
+    applicationType,
   });
 
-  // TODO: Commenting out temporarily until old ATI code is removed - https://bbc.atlassian.net/browse/WS-222
-  // if (['responsive', 'lite'].includes(applicationType)) {
-  //   expect(params.idclient).to.equal(
-  //     ATI_USER_ID_COOKIE,
-  //     'params.idclient (atuserid cookie value)',
-  //   );
-  // }
-
   expect(params.events).to.satisfy(
     payload =>
       validateViewabilityEventDetails({
@@ -331,6 +322,7 @@ export const assertATIComponentClickEvent = ({
   component,
   contentType,
   pageIdentifier,
+  applicationType,
   siteId,
 }) => {
   const requestAlias = `@${component}-viewability-click`;
@@ -344,6 +336,7 @@ export const assertATIComponentClickEvent = ({
         contentType,
         pageIdentifier,
         params,
+        applicationType,
         siteId,
       });
     });

cypress/e2e/specialFeatures/atiAnalytics/assertions/latestMedia.js

@@ -6,7 +6,6 @@ const { LATEST_MEDIA } = COMPONENTS;
 export const assertLatestMediaComponentView = ({
   pageIdentifier,
   contentType,
-  useReverb,
   path,
   applicationType,
   siteId,
@@ -21,7 +20,6 @@ export const assertLatestMediaComponentView = ({
       component: LATEST_MEDIA,
       pageIdentifier,
       contentType,
-      useReverb,
       applicationType,
       siteId,
     });
@@ -31,7 +29,6 @@ export const assertLatestMediaComponentView = ({
 export const assertLatestMediaComponentClick = ({
   pageIdentifier,
   contentType,
-  useReverb,
   path,
   applicationType,
   siteId,
@@ -51,7 +48,6 @@ export const assertLatestMediaComponentClick = ({
       component: LATEST_MEDIA,
       pageIdentifier,
       contentType,
-      useReverb,
       applicationType,
       siteId,
     });