naming and test simplification

Author: fzhao99

client/e2e/configuration.spec.ts

@@ -178,7 +178,7 @@ test.describe('Configuration detail flow', () => {
       await expect(makeAxeBuilder).toHaveNoAxeViolations();
 
       // change the text and the error should go away
-      await page.getByLabel('Code #').fill(newCode);
+      await page.getByLabel('Code').fill(newCode);
       await page.getByLabel('Code name').click();
       await expect(expectedError).not.toBeVisible();
       await expect(updateButton).toBeEnabled();
@@ -217,14 +217,14 @@ test.describe('Configuration detail flow', () => {
       const addButton = page.getByRole('button', { name: 'Add custom code' });
 
       // fill in form
-      await page.getByLabel('Code #').fill(customCode2.code);
+      await page.getByLabel('Code').fill(customCode2.code);
       await page.getByLabel('Code system').selectOption(customCode2.system);
       await page.getByLabel('Code name').fill(customCode2.name);
 
       await expect(expectedError).toBeVisible();
       await expect(addButton).not.toBeEnabled();
 
-      await page.getByLabel('Code #').fill(newCode);
+      await page.getByLabel('Code').fill(newCode);
       await page.getByLabel('Code system').selectOption(newSystem);
       await page.getByLabel('Code name').click();
       await expect(expectedError).not.toBeVisible();
@@ -508,14 +508,16 @@ test.describe('Configuration detail flow', () => {
         page.getByRole('heading', { name: 'Edit 12345', level: 2 })
       ).toBeVisible();
       const testCode = 'test code ~';
-      await page.getByLabel('Code #').fill(testCode);
+      await page.getByLabel('Code').fill(testCode);
       await page.getByLabel('Code system').selectOption('CVX');
       await page.getByLabel('Code name').fill('test code_name');
+      await page.getByRole('button', { name: 'Save changes' }).click();
+
+      await editButton.click();
       await expect(
         page.getByRole('heading', { name: `Edit ${testCode}`, level: 2 })
       ).toBeVisible();
-      await page.getByRole('button', { name: 'Save changes' }).click();
-
+      await page.getByLabel('Close this window').click();
       await expect(
         page.getByText('Other Example', { exact: true })
       ).not.toBeVisible();

client/e2e/pages/ConfigurationPage.ts

@@ -71,7 +71,7 @@ export class ConfigurationPage {
     await this.page
       .getByRole('button', { name: 'Add new custom code' })
       .click();
-    await this.page.getByLabel('Code #').fill(code);
+    await this.page.getByLabel('Code').fill(code);
     await this.page.getByLabel('Code system').selectOption(codeSystem);
     await this.page.getByLabel('Code name').fill(codeName);
     await this.page.getByRole('button', { name: 'Add custom code' }).click();
@@ -88,7 +88,7 @@ export class ConfigurationPage {
     await this.page
       .getByRole('button', { name: `Edit custom code ${currentCodeName}` })
       .click();
-    if (newCode) await this.page.getByLabel('Code #').fill(newCode);
+    if (newCode) await this.page.getByLabel('Code').fill(newCode);
     if (newCodeSystem)
       await this.page.getByLabel('Code system').selectOption(newCodeSystem);
     if (newCodeName) await this.page.getByLabel('Code name').fill(newCodeName);