Skip to content

Commit 15d53c2

Browse files
authored
Merge pull request #13596 from bbc/WS-222-clean-up-contentType
WS-222: Delete `componentTrackingContentType` & `contentType` from e2e assertions
2 parents 15e5d84 + acdb9f0 commit 15d53c2

39 files changed

+0
-166
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ const atiAnalyticsTestSuites = [
8787
siteId: 59,
8888
applicationType: 'responsive',
8989
contentType: 'index-category',
90-
componentTrackingContentType: 'topic-page',
9190
tests: [assertPageView],
9291
},
9392
{
@@ -98,7 +97,6 @@ const atiAnalyticsTestSuites = [
9897
siteId: 33,
9998
applicationType: 'responsive',
10099
contentType: 'index-category',
101-
componentTrackingContentType: 'topic-page',
102100
tests: [
103101
assertPageView,
104102
assertScrollableNavigationComponentView,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const { ARTICLE_LITE_SITE_LINK } = COMPONENTS;
55

66
export const assertArticleLiteSiteLinkComponentView = ({
77
pageIdentifier,
8-
contentType,
98
path,
109
applicationType,
1110
siteId,
@@ -21,7 +20,6 @@ export const assertArticleLiteSiteLinkComponentView = ({
2120
assertATIComponentViewEvent({
2221
component: ARTICLE_LITE_SITE_LINK,
2322
pageIdentifier,
24-
contentType,
2523
applicationType,
2624
siteId,
2725
});
@@ -30,7 +28,6 @@ export const assertArticleLiteSiteLinkComponentView = ({
3028

3129
export const assertArticleLiteSiteLinkComponentClick = ({
3230
pageIdentifier,
33-
contentType,
3431
path,
3532
applicationType,
3633
siteId,
@@ -49,7 +46,6 @@ export const assertArticleLiteSiteLinkComponentClick = ({
4946
assertATIComponentClickEvent({
5047
component: ARTICLE_LITE_SITE_LINK,
5148
pageIdentifier,
52-
contentType,
5349
applicationType,
5450
siteId,
5551
});

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const { FEATURES } = COMPONENTS;
55

66
export const assertFeaturesAnalysisComponentView = ({
77
pageIdentifier,
8-
contentType,
98
path,
109
applicationType,
1110
siteId,
@@ -19,7 +18,6 @@ export const assertFeaturesAnalysisComponentView = ({
1918
assertATIComponentViewEvent({
2019
component: FEATURES,
2120
pageIdentifier,
22-
contentType,
2321
applicationType,
2422
siteId,
2523
});
@@ -28,7 +26,6 @@ export const assertFeaturesAnalysisComponentView = ({
2826

2927
export const assertFeaturesAnalysisComponentClick = ({
3028
pageIdentifier,
31-
contentType,
3229
path,
3330
applicationType,
3431
siteId,
@@ -45,7 +42,6 @@ export const assertFeaturesAnalysisComponentClick = ({
4542
assertATIComponentClickEvent({
4643
component: FEATURES,
4744
pageIdentifier,
48-
contentType,
4945
applicationType,
5046
siteId,
5147
});

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ const assertViewabilityModelViewEvent = ({
270270
export const assertATIComponentViewEvent = ({
271271
component,
272272
pageIdentifier,
273-
contentType,
274273
applicationType,
275274
siteId,
276275
}) => {
@@ -284,7 +283,6 @@ export const assertATIComponentViewEvent = ({
284283
assertViewabilityModelViewEvent({
285284
component,
286285
pageIdentifier,
287-
contentType,
288286
params,
289287
applicationType,
290288
siteId,
@@ -320,7 +318,6 @@ const assertViewabilityModelClickEvent = ({
320318

321319
export const assertATIComponentClickEvent = ({
322320
component,
323-
contentType,
324321
pageIdentifier,
325322
applicationType,
326323
siteId,
@@ -333,7 +330,6 @@ export const assertATIComponentClickEvent = ({
333330
const params = getATIParamsFromURL(url);
334331
assertViewabilityModelClickEvent({
335332
component,
336-
contentType,
337333
pageIdentifier,
338334
params,
339335
applicationType,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const { LATEST_MEDIA } = COMPONENTS;
55

66
export const assertLatestMediaComponentView = ({
77
pageIdentifier,
8-
contentType,
98
path,
109
applicationType,
1110
siteId,
@@ -19,7 +18,6 @@ export const assertLatestMediaComponentView = ({
1918
assertATIComponentViewEvent({
2019
component: LATEST_MEDIA,
2120
pageIdentifier,
22-
contentType,
2321
applicationType,
2422
siteId,
2523
});
@@ -28,7 +26,6 @@ export const assertLatestMediaComponentView = ({
2826

2927
export const assertLatestMediaComponentClick = ({
3028
pageIdentifier,
31-
contentType,
3229
path,
3330
applicationType,
3431
siteId,
@@ -47,7 +44,6 @@ export const assertLatestMediaComponentClick = ({
4744
assertATIComponentClickEvent({
4845
component: LATEST_MEDIA,
4946
pageIdentifier,
50-
contentType,
5147
applicationType,
5248
siteId,
5349
});

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ const { LITE_SITE_SUMMARY } = COMPONENTS;
66
// eslint-disable-next-line import/prefer-default-export
77
export const assertLiteSiteSummaryComponentToMainSiteClick = ({
88
pageIdentifier,
9-
contentType,
10-
componentTrackingContentType,
119
path,
1210
applicationType,
1311
siteId,
@@ -26,7 +24,6 @@ export const assertLiteSiteSummaryComponentToMainSiteClick = ({
2624
assertATIComponentClickEvent({
2725
component: LITE_SITE_SUMMARY,
2826
pageIdentifier,
29-
contentType: componentTrackingContentType || contentType,
3027
applicationType,
3128
siteId,
3229
});

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const { LIVE_MEDIA } = COMPONENTS;
55

66
export const assertLiveMediaComponentView = ({
77
pageIdentifier,
8-
contentType,
98
path,
109
applicationType,
1110
siteId,
@@ -21,7 +20,6 @@ export const assertLiveMediaComponentView = ({
2120
assertATIComponentViewEvent({
2221
component: LIVE_MEDIA,
2322
pageIdentifier,
24-
contentType,
2523
applicationType,
2624
siteId,
2725
});
@@ -30,7 +28,6 @@ export const assertLiveMediaComponentView = ({
3028

3129
export const assertLiveMediaComponentClick = ({
3230
pageIdentifier,
33-
contentType,
3431
path,
3532
applicationType,
3633
siteId,
@@ -48,7 +45,6 @@ export const assertLiveMediaComponentClick = ({
4845
assertATIComponentClickEvent({
4946
component: LIVE_MEDIA,
5047
pageIdentifier,
51-
contentType,
5248
applicationType,
5349
siteId,
5450
});

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ const { MESSAGE_BANNER } = COMPONENTS;
55

66
export const assertMessageBannerComponentView = ({
77
pageIdentifier,
8-
contentType,
9-
componentTrackingContentType,
108
path,
119
applicationType,
1210
siteId,
@@ -22,7 +20,6 @@ export const assertMessageBannerComponentView = ({
2220
assertATIComponentViewEvent({
2321
component: MESSAGE_BANNER,
2422
pageIdentifier,
25-
contentType: componentTrackingContentType || contentType,
2623
applicationType,
2724
siteId,
2825
});
@@ -31,8 +28,6 @@ export const assertMessageBannerComponentView = ({
3128

3229
export const assertMessageBannerComponentClick = ({
3330
pageIdentifier,
34-
contentType,
35-
componentTrackingContentType,
3631
path,
3732
applicationType,
3833
siteId,
@@ -51,7 +46,6 @@ export const assertMessageBannerComponentClick = ({
5146
assertATIComponentClickEvent({
5247
component: MESSAGE_BANNER,
5348
pageIdentifier,
54-
contentType: componentTrackingContentType || contentType,
5549
applicationType,
5650
siteId,
5751
});

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const { MOST_READ } = COMPONENTS;
66

77
export const assertMostReadComponentView = ({
88
pageIdentifier,
9-
contentType,
109
path,
1110
service,
1211
applicationType,
@@ -27,7 +26,6 @@ export const assertMostReadComponentView = ({
2726
assertATIComponentViewEvent({
2827
component: MOST_READ,
2928
pageIdentifier,
30-
contentType,
3129
applicationType,
3230
siteId,
3331
});
@@ -36,7 +34,6 @@ export const assertMostReadComponentView = ({
3634

3735
export const assertMostReadComponentClick = ({
3836
pageIdentifier,
39-
contentType,
4037
path,
4138
service,
4239
applicationType,
@@ -60,7 +57,6 @@ export const assertMostReadComponentClick = ({
6057
assertATIComponentClickEvent({
6158
component: MOST_READ,
6259
pageIdentifier,
63-
contentType,
6460
applicationType,
6561
siteId,
6662
});

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ const { SCROLLABLE_NAVIGATION, DROPDOWN_NAVIGATION } = COMPONENTS;
55

66
export const assertScrollableNavigationComponentView = ({
77
pageIdentifier,
8-
contentType,
9-
componentTrackingContentType,
108
path,
119
applicationType,
1210
siteId,
@@ -22,7 +20,6 @@ export const assertScrollableNavigationComponentView = ({
2220
assertATIComponentViewEvent({
2321
component: SCROLLABLE_NAVIGATION,
2422
pageIdentifier,
25-
contentType: componentTrackingContentType || contentType,
2623
applicationType,
2724
siteId,
2825
});
@@ -31,8 +28,6 @@ export const assertScrollableNavigationComponentView = ({
3128

3229
export const assertScrollableNavigationComponentClick = ({
3330
pageIdentifier,
34-
contentType,
35-
componentTrackingContentType,
3631
path,
3732
applicationType,
3833
siteId,
@@ -51,7 +46,6 @@ export const assertScrollableNavigationComponentClick = ({
5146
assertATIComponentClickEvent({
5247
component: SCROLLABLE_NAVIGATION,
5348
pageIdentifier,
54-
contentType: componentTrackingContentType || contentType,
5549
applicationType,
5650
siteId,
5751
});
@@ -61,8 +55,6 @@ export const assertScrollableNavigationComponentClick = ({
6155
// Assertions for nav bar at smaller breakpoints
6256
export const assertDropdownNavigationComponentView = ({
6357
pageIdentifier,
64-
contentType,
65-
componentTrackingContentType,
6658
path,
6759
applicationType,
6860
siteId,
@@ -77,7 +69,6 @@ export const assertDropdownNavigationComponentView = ({
7769
assertATIComponentViewEvent({
7870
component: DROPDOWN_NAVIGATION,
7971
pageIdentifier,
80-
contentType: componentTrackingContentType || contentType,
8172
applicationType,
8273
siteId,
8374
});
@@ -86,8 +77,6 @@ export const assertDropdownNavigationComponentView = ({
8677

8778
export const assertDropdownNavigationComponentClick = ({
8879
pageIdentifier,
89-
contentType,
90-
componentTrackingContentType,
9180
path,
9281
applicationType,
9382
siteId,
@@ -105,7 +94,6 @@ export const assertDropdownNavigationComponentClick = ({
10594
assertATIComponentClickEvent({
10695
component: DROPDOWN_NAVIGATION,
10796
pageIdentifier,
108-
contentType: componentTrackingContentType || contentType,
10997
applicationType,
11098
siteId,
11199
});

0 commit comments

Comments
 (0)