Update test cases

Author: jsoningram

special-pages/pages/new-tab/app/activity/integration-tests/activity.page.js

@@ -441,4 +441,22 @@ export class ActivityPage {
           - paragraph: Past 7 days
       `);
     }
+
+    /**
+     * Test that cookie popup blocked indicator is shown for items with cookiePopUpBlocked: true
+     */
+    async showsCookiePopupBlockedIndicator() {
+        // First item in 'few' mock has cookiePopUpBlocked: true
+        const firstItem = this.context().getByTestId('ActivityItem').nth(0);
+        await expect(firstItem.getByText(/cookie pop-up/i)).toBeVisible();
+    }
+
+    /**
+     * Test that cookie popup blocked indicator is NOT shown for items with cookiePopUpBlocked: false
+     */
+    async hidesCookiePopupIndicatorWhenNotBlocked() {
+        // Second item in 'few' mock (youtube) has cookiePopUpBlocked: false
+        const secondItem = this.context().getByTestId('ActivityItem').nth(1);
+        await expect(secondItem.getByText(/cookie pop-up/i)).not.toBeVisible();
+    }
 }

special-pages/pages/new-tab/app/activity/integration-tests/activity.spec.js

@@ -100,6 +100,22 @@ test.describe('activity widget', () => {
         await ap.didRender();
         await ap.showsAdsAndTrackersTrackerStates();
     });
+    test('shows cookie popup blocked indicator', async ({ page }, workerInfo) => {
+        const ntp = NewtabPage.create(page, workerInfo);
+        const ap = new ActivityPage(page, ntp);
+        await ntp.reducedMotion();
+        await ntp.openPage({ additional: { ...defaultPageParams } });
+        await ap.didRender();
+        await ap.showsCookiePopupBlockedIndicator();
+    });
+    test('hides cookie popup indicator when not blocked', async ({ page }, workerInfo) => {
+        const ntp = NewtabPage.create(page, workerInfo);
+        const ap = new ActivityPage(page, ntp);
+        await ntp.reducedMotion();
+        await ntp.openPage({ additional: { ...defaultPageParams } });
+        await ap.didRender();
+        await ap.hidesCookiePopupIndicatorWhenNotBlocked();
+    });
     test('after rendering and navigating to a new tab, data is re-requested on return', async ({ page }, workerInfo) => {
         const ntp = NewtabPage.create(page, workerInfo);
         const ap = new ActivityPage(page, ntp);

special-pages/pages/new-tab/app/protections/integrations-tests/protections.page.js

@@ -40,6 +40,7 @@ export class ProtectionsPage {
         /** @type {ProtectionsData} */
         const data = {
             totalCount: count,
+            totalCookiePopUpsBlocked: null, // null means CPM is not enabled
         };
         await this.ntp.mocks.simulateSubscriptionMessage(named.subscription('protections_onDataUpdate'), data);
         await expect(this.context().getByRole('heading', { level: 3 })).toContainText(`${count} tracking attempts blocked`);
@@ -56,4 +57,56 @@ export class ProtectionsPage {
           - paragraph: Ostatnie 7 dni
           `);
     }
+
+    /**
+     * Test that cookie popup blocking stats are displayed when both trackers and cookie popups are > 0
+     */
+    async displaysCookiePopupStats() {
+        /** @type {ProtectionsData} */
+        const data = {
+            totalCount: 100,
+            totalCookiePopUpsBlocked: 25,
+        };
+        await this.ntp.mocks.simulateSubscriptionMessage(named.subscription('protections_onDataUpdate'), data);
+        await expect(this.context().getByRole('heading', { level: 3 }).first()).toContainText('100 tracking attempts blocked');
+        // Cookie popup stats should be visible
+        await expect(this.context().getByText(/cookie pop-ups?/i)).toBeVisible();
+    }
+
+    /**
+     * Test that cookie popup stats are NOT displayed when totalCookiePopUpsBlocked is null (CPM disabled)
+     */
+    async hidesCookiePopupStatsWhenDisabled() {
+        /** @type {ProtectionsData} */
+        const data = {
+            totalCount: 100,
+            totalCookiePopUpsBlocked: null,
+        };
+        await this.ntp.mocks.simulateSubscriptionMessage(named.subscription('protections_onDataUpdate'), data);
+        // Cookie popup stats should not be visible
+        await expect(this.context().getByText(/cookie pop-ups?/i)).not.toBeVisible();
+    }
+
+    /**
+     * Test that cookie popup stats are NOT displayed when totalCookiePopUpsBlocked is 0
+     */
+    async hidesCookiePopupStatsWhenZero() {
+        /** @type {ProtectionsData} */
+        const data = {
+            totalCount: 100,
+            totalCookiePopUpsBlocked: 0,
+        };
+        await this.ntp.mocks.simulateSubscriptionMessage(named.subscription('protections_onDataUpdate'), data);
+        // Cookie popup stats should not be visible when count is 0
+        await expect(this.context().getByText(/cookie pop-ups?/i)).not.toBeVisible();
+    }
+
+    /**
+     * Test that the info tooltip is displayed
+     */
+    async hasInfoTooltip() {
+        const heading = this.context().getByTestId('ProtectionsHeading');
+        // The InfoIcon should be present
+        await expect(heading.locator('[class*="infoIcon"]')).toBeVisible();
+    }
 }

special-pages/pages/new-tab/app/protections/integrations-tests/protections.spec.js

@@ -56,4 +56,44 @@ test.describe('protections report', () => {
         await protections.ready();
         await protections.hasPolishText();
     });
+
+    test('displays cookie popup blocking stats when enabled and counts > 0', async ({ page }, workerInfo) => {
+        const ntp = NewtabPage.create(page, workerInfo);
+        await ntp.reducedMotion();
+        await ntp.openPage({ additional: { 'protections.feed': 'activity' } });
+
+        const protections = new ProtectionsPage(ntp);
+        await protections.ready();
+        await protections.displaysCookiePopupStats();
+    });
+
+    test('hides cookie popup stats when CPM is disabled (null)', async ({ page }, workerInfo) => {
+        const ntp = NewtabPage.create(page, workerInfo);
+        await ntp.reducedMotion();
+        await ntp.openPage({ additional: { 'protections.feed': 'activity' } });
+
+        const protections = new ProtectionsPage(ntp);
+        await protections.ready();
+        await protections.hidesCookiePopupStatsWhenDisabled();
+    });
+
+    test('hides cookie popup stats when count is 0', async ({ page }, workerInfo) => {
+        const ntp = NewtabPage.create(page, workerInfo);
+        await ntp.reducedMotion();
+        await ntp.openPage({ additional: { 'protections.feed': 'activity' } });
+
+        const protections = new ProtectionsPage(ntp);
+        await protections.ready();
+        await protections.hidesCookiePopupStatsWhenZero();
+    });
+
+    test('displays info tooltip', async ({ page }, workerInfo) => {
+        const ntp = NewtabPage.create(page, workerInfo);
+        await ntp.reducedMotion();
+        await ntp.openPage({ additional: { 'protections.feed': 'activity' } });
+
+        const protections = new ProtectionsPage(ntp);
+        await protections.ready();
+        await protections.hasInfoTooltip();
+    });
 });