comments

Author: alexnuttall

frontend/src/__tests__/app/message-plans/page.test.tsx

@@ -74,8 +74,6 @@ describe('MessagePlansPage', () => {
       typeof MessagePlans
     >;
 
-    expect(page.props).toBeDefined();
-
     expect(getRoutingConfigsMock).toHaveBeenCalledTimes(1);
 
     expect(countRoutingConfigsMock).toHaveBeenNthCalledWith(1, 'DRAFT');

frontend/src/__tests__/components/molecules/__snapshots__/MessagePlans.test.tsx.snap

@@ -18,7 +18,7 @@ exports[`MessagePlans matches snapshot 1`] = `
         </h1>
         <details
           class="nhsuk-details"
-          id="message-plans-status-info"
+          data-testid="message-plans-status-info"
         >
           <summary
             class="nhsuk-details__summary"
@@ -89,9 +89,9 @@ exports[`MessagePlans matches snapshot 1`] = `
         <a
           aria-disabled="false"
           class="nhsuk-button"
+          data-testid="create-message-plan-button"
           draggable="false"
           href="/message-plans/choose-message-order"
-          id="create-message-plan-button"
           role="button"
         >
           New message plan

frontend/src/__tests__/components/molecules/__snapshots__/MessagePlansList.test.tsx.snap

@@ -4,7 +4,7 @@ exports[`MessagePlansList matches snapshot when data is available 1`] = `
 <DocumentFragment>
   <details
     class="nhsuk-details nhsuk-expander"
-    id="message-plans-list-draft"
+    data-testid="message-plans-list-draft"
   >
     <summary
       class="nhsuk-details__summary nhsuk-heading-s nhsuk-u-margin-bottom-0"
@@ -117,7 +117,7 @@ exports[`MessagePlansList matches snapshot when no data is available 1`] = `
 <DocumentFragment>
   <details
     class="nhsuk-details nhsuk-expander"
-    id="message-plans-list-draft"
+    data-testid="message-plans-list-draft"
   >
     <summary
       class="nhsuk-details__summary nhsuk-heading-s nhsuk-u-margin-bottom-0"

frontend/src/__tests__/utils/form-actions.test.ts

@@ -785,7 +785,7 @@ describe('form-actions', () => {
         },
       ];
 
-      // a487ed49-e2f7-4871-ac8d-0c6c682c71f5 is the newest, 8f5157fe-72d7-4a9c-818f-77c128ec8197 is the oldest.
+      // a48... is the newest, 8f5... is the oldest.
       // the others all have the same createdAt.
       const expectedOrder = [
         'a487ed49-e2f7-4871-ac8d-0c6c682c71f5',

frontend/src/components/molecules/MessagePlans/MessagePlans.tsx

@@ -35,7 +35,7 @@ export const MessagePlans = (props: MessagePlansProps) => {
       <div className='nhsuk-grid-row'>
         <div className='nhsuk-grid-column-full'>
           <h1>{pageHeading}</h1>
-          <Details id='message-plans-status-info'>
+          <Details data-testid='message-plans-status-info'>
             <Details.Summary>{draftAndProdHeading}</Details.Summary>
             <Details.Text>
               {draftAndProductionInfo.map(
@@ -56,7 +56,9 @@ export const MessagePlans = (props: MessagePlansProps) => {
             </Details.Text>
           </Details>
           <Link passHref legacyBehavior href={button.link}>
-            <Button id='create-message-plan-button'>{button.text}</Button>
+            <Button data-testid='create-message-plan-button'>
+              {button.text}
+            </Button>
           </Link>
           <MessagePlansList
             status='DRAFT'

frontend/src/components/molecules/MessagePlansList/MessagePlansList.tsx

@@ -59,7 +59,7 @@ export const MessagePlansList = (props: MessagePlansListProps) => {
   ));
 
   return (
-    <Details expander id={`message-plans-list-${statusDisplayLower}`}>
+    <Details expander data-testid={`message-plans-list-${statusDisplayLower}`}>
       <Details.Summary
         className={classNames('nhsuk-heading-s', 'nhsuk-u-margin-bottom-0')}
       >

lambdas/backend-client/src/__tests__/routing-config-api-client.test.ts

@@ -42,7 +42,7 @@ describe('RoutingConfigurationApiClient', () => {
       expect(axiosMock.history.get.length).toBe(1);
     });
 
-    it('should return number of routing configuration', async () => {
+    it('should return number of routing configurations', async () => {
       axiosMock
         .onGet('/v1/routing-configurations/count', {
           params: { status: 'COMPLETED' },
@@ -86,7 +86,7 @@ describe('RoutingConfigurationApiClient', () => {
       expect(axiosMock.history.get.length).toBe(1);
     });
 
-    it('should return list of routing configuration', async () => {
+    it('should return list of routing configurations', async () => {
       const data = {
         campaignId: 'campaignId',
         cascade: [],

tests/test-team/pages/routing-message-plans-page.ts

@@ -14,11 +14,11 @@ export class RoutingMessagePlansPage extends TemplateMgmtBasePageNonDynamic {
 
   constructor(page: Page) {
     super(page);
-    this.messagePlanStatusInfo = page.locator('#message-plans-status-info');
-    this.newMessagePlanButton = page.locator('#create-message-plan-button');
-    this.draftMessagePlansTable = page.locator('#message-plans-list-draft');
-    this.productionMessagePlansTable = page.locator(
-      '#message-plans-list-production'
+    this.messagePlanStatusInfo = page.getByTestId('message-plans-status-info');
+    this.newMessagePlanButton = page.getByTestId('create-message-plan-button');
+    this.draftMessagePlansTable = page.getByTestId('message-plans-list-draft');
+    this.productionMessagePlansTable = page.getByTestId(
+      'message-plans-list-production'
     );
   }
 

tests/test-team/template-mgmt-routing-component-tests/message-plans.routing-component.spec.ts

@@ -61,6 +61,16 @@ test.describe('Message plans Page', () => {
     const messagePlanPage = new RoutingMessagePlansPage(page);
     await messagePlanPage.loadPage();
 
+    await expect(messagePlanPage.draftMessagePlansTable).not.toHaveAttribute(
+      'open'
+    );
+
+    await messagePlanPage.draftMessagePlansTable.click();
+
+    await expect(messagePlanPage.draftMessagePlansTable).toHaveAttribute(
+      'open'
+    );
+
     const draftIdCells = messagePlanPage.draftMessagePlansTable.getByTestId(
       'message-plan-id-cell'
     );
@@ -84,6 +94,16 @@ test.describe('Message plans Page', () => {
       )
     ).toBeUndefined();
 
+    await expect(
+      messagePlanPage.productionMessagePlansTable
+    ).not.toHaveAttribute('open');
+
+    await messagePlanPage.productionMessagePlansTable.click();
+
+    await expect(messagePlanPage.productionMessagePlansTable).toHaveAttribute(
+      'open'
+    );
+
     const productionIdCells =
       messagePlanPage.productionMessagePlansTable.getByTestId(
         'message-plan-id-cell'