test: [M3-8321] - Clean up feature flag mocks (#10892)

* Remove feature flag mocks * Added changeset: Clean up feature flag mocks
linode · Sep 10, 2024 · f83b918 · f83b918
1 parent 69d1ecb
commit f83b918
Show file tree

Hide file tree

Showing 21 changed files with 674 additions and 158 deletions.
diff --git a/packages/manager/.changeset/pr-10892-tests-1725546783401.md b/packages/manager/.changeset/pr-10892-tests-1725546783401.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tests
+---
+
+Clean up feature flag mocks ([#10892](https://github.com/linode/manager/pull/10892))
diff --git a/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts b/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts
@@ -2,13 +2,8 @@ import { mockGetAccount, mockUpdateAccount } from 'support/intercepts/account';
 import { accountFactory } from 'src/factories/account';
 import type { Account } from '@linode/api-v4';
 import { ui } from 'support/ui';
-import { makeFeatureFlagData } from 'support/util/feature-flags';
 import { TAX_ID_HELPER_TEXT } from 'src/features/Billing/constants';
-import {
-  mockAppendFeatureFlags,
-  mockGetFeatureFlagClientstream,
-} from 'support/intercepts/feature-flags';
-import type { Flags } from 'src/featureFlags';
+import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
 
 /* eslint-disable sonarjs/no-duplicate-string */
 const accountData = accountFactory.build({
@@ -72,11 +67,10 @@ const checkAccountContactDisplay = (accountInfo: Account) => {
 describe('Billing Contact', () => {
   beforeEach(() => {
     mockAppendFeatureFlags({
-      taxId: makeFeatureFlagData<Flags['taxId']>({
+      taxId: {
         enabled: true,
-      }),
+      },
     });
-    mockGetFeatureFlagClientstream();
   });
   it('Edit Contact Info', () => {
     // mock the user's account data and confirm that it is displayed correctly upon page load

diff --git a/packages/manager/cypress/e2e/core/general/gdpr-agreement.spec.ts b/packages/manager/cypress/e2e/core/general/gdpr-agreement.spec.ts
@@ -3,7 +3,6 @@ import { linodeFactory, regionFactory } from '@src/factories';
 import { randomString, randomLabel } from 'support/util/random';
 import { mockGetRegions } from 'support/intercepts/regions';
 import { mockGetAccountAgreements } from 'support/intercepts/account';
-
 import type { Region } from '@linode/api-v4';
 import { mockCreateLinode } from 'support/intercepts/linodes';
 

diff --git a/packages/manager/cypress/e2e/core/helpAndSupport/close-support-ticket.spec.ts b/packages/manager/cypress/e2e/core/helpAndSupport/close-support-ticket.spec.ts
@@ -1,9 +1,5 @@
 import 'cypress-file-upload';
-import {
-  mockAppendFeatureFlags,
-  mockGetFeatureFlagClientstream,
-} from 'support/intercepts/feature-flags';
-import { makeFeatureFlagData } from 'support/util/feature-flags';
+import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
 import { ui } from 'support/ui';
 import {
   randomItem,
@@ -48,9 +44,8 @@ describe('close support tickets', () => {
     }
 
     mockAppendFeatureFlags({
-      supportTicketSeverity: makeFeatureFlagData(true),
+      supportTicketSeverity: true,
     });
-    mockGetFeatureFlagClientstream();
     mockGetSupportTickets([mockTicket]);
     mockGetSupportTicket(mockTicket).as('getSupportTicket');
     mockGetSupportTicketReplies(mockTicket.id, []).as('getReplies');
@@ -107,9 +102,8 @@ describe('close support tickets', () => {
     }
 
     mockAppendFeatureFlags({
-      supportTicketSeverity: makeFeatureFlagData(true),
+      supportTicketSeverity: true,
     });
-    mockGetFeatureFlagClientstream();
     mockGetSupportTickets([mockTicket]);
     mockGetSupportTicket(mockTicket).as('getSupportTicket');
     mockGetSupportTicketReplies(mockTicket.id, []).as('getReplies');

diff --git a/packages/manager/cypress/e2e/core/helpAndSupport/open-support-ticket.spec.ts b/packages/manager/cypress/e2e/core/helpAndSupport/open-support-ticket.spec.ts
@@ -2,11 +2,7 @@
 /* eslint-disable sonarjs/no-duplicate-string */
 import 'cypress-file-upload';
 import { interceptGetProfile } from 'support/intercepts/profile';
-import {
-  mockAppendFeatureFlags,
-  mockGetFeatureFlagClientstream,
-} from 'support/intercepts/feature-flags';
-import { makeFeatureFlagData } from 'support/util/feature-flags';
+import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
 import { ui } from 'support/ui';
 import {
   randomItem,
@@ -69,9 +65,8 @@ describe('open support tickets', () => {
    */
   it('can open a support ticket', () => {
     mockAppendFeatureFlags({
-      supportTicketSeverity: makeFeatureFlagData(false),
+      supportTicketSeverity: false,
     });
-    mockGetFeatureFlagClientstream();
 
     const image = 'test_screenshot.png';
     const ticketDescription = 'this is a test ticket';
@@ -159,9 +154,8 @@ describe('open support tickets', () => {
     }
 
     mockAppendFeatureFlags({
-      supportTicketSeverity: makeFeatureFlagData(true),
+      supportTicketSeverity: true,
     });
-    mockGetFeatureFlagClientstream();
     mockCreateSupportTicket(mockTicket).as('createTicket');
     mockGetSupportTickets([]);
     mockGetSupportTicket(mockTicket);

diff --git a/packages/manager/cypress/e2e/core/helpAndSupport/support-tickets-landing-page.spec.ts b/packages/manager/cypress/e2e/core/helpAndSupport/support-tickets-landing-page.spec.ts
@@ -1,9 +1,5 @@
 import { interceptGetProfile } from 'support/intercepts/profile';
-import {
-  mockAppendFeatureFlags,
-  mockGetFeatureFlagClientstream,
-} from 'support/intercepts/feature-flags';
-import { makeFeatureFlagData } from 'support/util/feature-flags';
+import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
 import {
   randomItem,
   randomLabel,
@@ -38,9 +34,8 @@ describe('support tickets landing page', () => {
    */
   it('shows the empty message when there are no tickets.', () => {
     mockAppendFeatureFlags({
-      supportTicketSeverity: makeFeatureFlagData(false),
+      supportTicketSeverity: false,
     });
-    mockGetFeatureFlagClientstream();
 
     interceptGetProfile().as('getProfile');
 
@@ -92,9 +87,8 @@ describe('support tickets landing page', () => {
     const mockTickets = [mockTicket, mockAnotherTicket];
 
     mockAppendFeatureFlags({
-      supportTicketSeverity: makeFeatureFlagData(true),
+      supportTicketSeverity: true,
     });
-    mockGetFeatureFlagClientstream();
     mockGetSupportTickets(mockTickets);
 
     cy.visitWithLogin('/support/tickets');
@@ -156,9 +150,8 @@ describe('support tickets landing page', () => {
     }
 
     mockAppendFeatureFlags({
-      supportTicketSeverity: makeFeatureFlagData(true),
+      supportTicketSeverity: true,
     });
-    mockGetFeatureFlagClientstream();
     mockGetSupportTickets([mockTicket]);
     mockGetSupportTicket(mockTicket).as('getSupportTicket');
     mockGetSupportTicketReplies(mockTicket.id, []).as('getReplies');
@@ -251,9 +244,8 @@ describe('support tickets landing page', () => {
     }
 
     mockAppendFeatureFlags({
-      supportTicketSeverity: makeFeatureFlagData(true),
+      supportTicketSeverity: true,
     });
-    mockGetFeatureFlagClientstream();
     mockGetSupportTickets([mockTicket]);
     mockGetSupportTicket(mockTicket).as('getSupportTicket');
     mockGetSupportTicketReplies(mockTicket.id, []).as('getReplies');

diff --git a/packages/manager/cypress/e2e/core/images/create-image.spec.ts b/packages/manager/cypress/e2e/core/images/create-image.spec.ts
@@ -5,7 +5,6 @@ import { mockGetAccount } from 'support/intercepts/account';
 import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
 import { ui } from 'support/ui';
 import { cleanUp } from 'support/util/cleanup';
-import { makeFeatureFlagData } from 'support/util/feature-flags';
 import { createTestLinode } from 'support/util/linodes';
 import { randomLabel, randomPhrase } from 'support/util/random';
 import { mockGetRegions } from 'support/intercepts/regions';
@@ -127,7 +126,7 @@ describe('create image (e2e)', () => {
   it('displays notice informing user that Images are not encrypted, provided the LDE feature is enabled and the selected linode is not in an Edge region', () => {
     // Mock feature flag -- @TODO LDE: Remove feature flag once LDE is fully rolled out
     mockAppendFeatureFlags({
-      linodeDiskEncryption: makeFeatureFlagData(true),
+      linodeDiskEncryption: true,
     }).as('getFeatureFlags');
 
     // Mock responses
@@ -164,7 +163,7 @@ describe('create image (e2e)', () => {
   it('does not display a notice informing user that Images are not encrypted if the LDE feature is disabled', () => {
     // Mock feature flag -- @TODO LDE: Remove feature flag once LDE is fully rolled out
     mockAppendFeatureFlags({
-      linodeDiskEncryption: makeFeatureFlagData(false),
+      linodeDiskEncryption: false,
     }).as('getFeatureFlags');
 
     // Mock responses
@@ -201,7 +200,7 @@ describe('create image (e2e)', () => {
   it('does not display a notice informing user that Images are not encrypted if the selected linode is in an Edge region', () => {
     // Mock feature flag -- @TODO LDE: Remove feature flag once LDE is fully rolled out
     mockAppendFeatureFlags({
-      linodeDiskEncryption: makeFeatureFlagData(true),
+      linodeDiskEncryption: true,
     }).as('getFeatureFlags');
 
     // Mock responses

diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-landing-page.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-landing-page.spec.ts
@@ -12,20 +12,15 @@ import {
 import { getRegionById } from 'support/util/regions';
 import { readDownload } from 'support/util/downloads';
 import { ui } from 'support/ui';
-import {
-  mockAppendFeatureFlags,
-  mockGetFeatureFlagClientstream,
-} from 'support/intercepts/feature-flags';
-import { makeFeatureFlagData } from 'support/util/feature-flags';
+import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
 import { mockGetAccount } from 'support/intercepts/account';
 
 describe('LKE landing page', () => {
   it('does not display a Disk Encryption info banner if the LDE feature is disabled', () => {
     // Mock feature flag -- @TODO LDE: Remove feature flag once LDE is fully rolled out
     mockAppendFeatureFlags({
-      linodeDiskEncryption: makeFeatureFlagData(false),
+      linodeDiskEncryption: false,
     }).as('getFeatureFlags');
-    mockGetFeatureFlagClientstream().as('getClientStream');
 
     // Mock responses
     const mockAccount = accountFactory.build({
@@ -51,9 +46,8 @@ describe('LKE landing page', () => {
   it('displays a Disk Encryption info banner if the LDE feature is enabled', () => {
     // Mock feature flag -- @TODO LDE: Remove feature flag once LDE is fully rolled out
     mockAppendFeatureFlags({
-      linodeDiskEncryption: makeFeatureFlagData(true),
+      linodeDiskEncryption: true,
     }).as('getFeatureFlags');
-    mockGetFeatureFlagClientstream().as('getClientStream');
 
     // Mock responses
     const mockAccount = accountFactory.build({

diff --git a/packages/manager/cypress/e2e/core/linodes/create-linode-region-select.spec.ts b/packages/manager/cypress/e2e/core/linodes/create-linode-region-select.spec.ts
@@ -1,7 +1,5 @@
 import { ui } from 'support/ui';
-import {
-  regionFactory,
-} from '@src/factories';
+import { regionFactory } from '@src/factories';
 import { mockGetRegions } from 'support/intercepts/regions';
 import { extendRegion } from 'support/util/regions';
 
@@ -85,12 +83,9 @@ describe('Linode Create Region Select', () => {
     cy.get('[data-qa-autocomplete-popper="true"]').should('not.exist');
 
     // Confirm that the selected region is displayed in the input field.
-    cy.findByLabelText('Region').should(
-      'have.value',
-      'UK, London (eu-west)'
-    );
+    cy.findByLabelText('Region').should('have.value', 'UK, London (eu-west)');
 
     // Confirm that selecting a valid region updates the Plan Selection panel.
     expect(cy.get('[data-testid="table-row-empty"]').should('not.exist'));
   });
-});
+});
diff --git a/packages/manager/cypress/e2e/core/linodes/create-linode-view-code-snippet.spec.ts b/packages/manager/cypress/e2e/core/linodes/create-linode-view-code-snippet.spec.ts
@@ -6,12 +6,7 @@ import { ui } from 'support/ui';
 
 import { randomLabel, randomString } from 'support/util/random';
 import { linodeCreatePage } from 'support/ui/pages';
-import {
-  mockAppendFeatureFlags,
-  mockGetFeatureFlagClientstream,
-} from 'support/intercepts/feature-flags';
-
-import { makeFeatureFlagData } from 'support/util/feature-flags';
+import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
 import { chooseRegion } from 'support/util/regions';
 
 describe('Create Linode', () => {
@@ -23,9 +18,8 @@ describe('Create Linode', () => {
     // TODO Delete these mocks once `apicliDxToolsAdditions` feature flag is retired.
     beforeEach(() => {
       mockAppendFeatureFlags({
-        apicliDxToolsAdditions: makeFeatureFlagData(true),
+        apicliDxToolsAdditions: true,
       });
-      mockGetFeatureFlagClientstream();
     });
     it(`view code snippets in create linode flow`, () => {
       const linodeLabel = randomLabel();
@@ -149,15 +143,14 @@ describe('Create Linode', () => {
         });
     });
   });
-  
+
   describe('Create Linode flow with apicliDxToolsAdditions disabled', () => {
     // Enable the `apicliDxToolsAdditions` feature flag.
     // TODO Delete these mocks and test once `apicliDxToolsAdditions` feature flag is retired.
     beforeEach(() => {
       mockAppendFeatureFlags({
-        apicliDxToolsAdditions: makeFeatureFlagData(false),
+        apicliDxToolsAdditions: false,
       });
-      mockGetFeatureFlagClientstream();
     });
     it(`view code snippets in create linode flow`, () => {
       const linodeLabel = randomLabel();
@@ -219,8 +212,10 @@ describe('Create Linode', () => {
 
     cy.get('[id="g6-dedicated-2"]').click();
 
-    cy.findByLabelText('Linode Label')
-      .should('have.value', `debian-${linodeRegion.id}`);
+    cy.findByLabelText('Linode Label').should(
+      'have.value',
+      `debian-${linodeRegion.id}`
+    );
 
     cy.findByLabelText('Linode Label')
       .should('be.visible')
@@ -244,9 +239,7 @@ describe('Create Linode', () => {
       .should('be.visible')
       .within(() => {
         // Switch to cURL view if necessary.
-        cy.findByText('cURL')
-          .should('be.visible')
-          .click();
+        cy.findByText('cURL').should('be.visible').click();
 
         // Confirm that cURL command has expected details.
         [

diff --git a/packages/manager/cypress/e2e/core/linodes/create-linode-with-dc-specific-pricing.spec.ts b/packages/manager/cypress/e2e/core/linodes/create-linode-with-dc-specific-pricing.spec.ts
@@ -1,9 +1,7 @@
 import { ui } from 'support/ui';
 import { randomLabel } from 'support/util/random';
 import { getRegionById } from 'support/util/regions';
-import {
-  linodeFactory,
-} from '@src/factories';
+import { linodeFactory } from '@src/factories';
 import {
   dcPricingPlanPlaceholder,
   dcPricingMockLinodeTypes,
@@ -58,8 +56,8 @@ describe('Create Linode with DC-specific pricing', () => {
     mockCreateLinode(mockLinode).as('linodeCreated');
 
     cy.get('[data-qa-header="Create"]').should('have.text', 'Create');
-    
-    ui.button.findByTitle("Create Linode").click();
+
+    ui.button.findByTitle('Create Linode').click();
 
     // A message is shown to instruct users to select a region in order to view plans and prices
     cy.get('[data-qa-tp="Linode Plan"]').should(
@@ -78,11 +76,10 @@ describe('Create Linode with DC-specific pricing', () => {
     cy.findByText('Shared CPU').click();
     cy.get(`[id="${dcPricingMockLinodeTypes[0].id}"]`).click();
     // Confirm that the backup prices are displayed as expected.
-    cy.get('[data-qa-add-ons="true"]')
-      .within(() => {
-        cy.findByText(`$${currentBackupPrice.monthly}`).should('be.visible');
-        cy.findByText('per month').should('be.visible');
-      });
+    cy.get('[data-qa-add-ons="true"]').within(() => {
+      cy.findByText(`$${currentBackupPrice.monthly}`).should('be.visible');
+      cy.findByText('per month').should('be.visible');
+    });
     // Confirm that the checkout summary at the bottom of the page reflects the correct price.
     cy.get('[data-qa-linode-create-summary="true"]').within(() => {
       cy.findByText(`$${currentPrice.monthly!.toFixed(2)}/month`).should(
@@ -103,11 +100,10 @@ describe('Create Linode with DC-specific pricing', () => {
     cy.findByText('Shared CPU').click();
     cy.get(`[id="${dcPricingMockLinodeTypes[0].id}"]`).click();
     // Confirm that the backup prices are displayed as expected.
-    cy.get('[data-qa-add-ons="true"]')
-      .within(() => {
-        cy.findByText(`$${newBackupPrice.monthly}`).should('be.visible');
-        cy.findByText('per month').should('be.visible');
-      });
+    cy.get('[data-qa-add-ons="true"]').within(() => {
+      cy.findByText(`$${newBackupPrice.monthly}`).should('be.visible');
+      cy.findByText('per month').should('be.visible');
+    });
     // Confirms that the summary updates to reflect price changes if the user changes their region and plan selection.
     cy.get('[data-qa-linode-create-summary="true"]').within(() => {
       cy.findByText(`$${newPrice.monthly!.toFixed(2)}/month`).should(
@@ -119,4 +115,4 @@ describe('Create Linode with DC-specific pricing', () => {
       );
     });
   });
-});
+});