diff --git a/cypress/e2e/04-covid_only_tests.cy.js b/cypress/e2e/04-covid_only_tests.cy.js index db25ce90e3..65ddbdf510 100644 --- a/cypress/e2e/04-covid_only_tests.cy.js +++ b/cypress/e2e/04-covid_only_tests.cy.js @@ -70,9 +70,7 @@ describe("Conducting a COVID test from:", () => { cy.injectSRAxe(); cy.get(".results-dropdown").within(() => { - cy.get("button.usa-button--unstyled:first-of-type") - .contains("Begin test") - .click(); + cy.get("[data-cy='name0-birthdate0']").contains("Begin test").click(); }); cy.wait("@AddPatientToQueue"); @@ -142,10 +140,8 @@ describe("Conducting a COVID test from:", () => { cy.get("input").type("2021-10-05"); }); - cy.get("[data-testid='symptom-selection']").within(() => { - cy.contains("label", "Chills").click(); - cy.contains("label", "Headache").click(); - }); + cy.contains("label", "Chills").click(); + cy.contains("label", "Headache").click(); cy.checkAccessibility(); diff --git a/frontend/src/app/Settings/Users/UserFacilitiesSettings.tsx b/frontend/src/app/Settings/Users/UserFacilitiesSettings.tsx index 5a45f4de6d..9285fe6f09 100644 --- a/frontend/src/app/Settings/Users/UserFacilitiesSettings.tsx +++ b/frontend/src/app/Settings/Users/UserFacilitiesSettings.tsx @@ -67,7 +67,7 @@ const UserFacilitiesSettings: React.FC = ({ boxes={boxes} legend="Facilities access" hintText={facilityAccessDescription} - name="facilities" + name="facilities-settings" required onChange={() => {}} validationStatus={error?.type ? "error" : undefined} diff --git a/frontend/src/app/Settings/Users/UserFacilitiesSettingsForm.tsx b/frontend/src/app/Settings/Users/UserFacilitiesSettingsForm.tsx index 11aa79f0bb..7a49e51e38 100644 --- a/frontend/src/app/Settings/Users/UserFacilitiesSettingsForm.tsx +++ b/frontend/src/app/Settings/Users/UserFacilitiesSettingsForm.tsx @@ -125,7 +125,7 @@ const UserFacilitiesSettingsForm: React.FC = ({ boxes={boxes} legend="Facilities" legendSrOnly - name="facilities" + name="facilities-settings-form" onChange={(e) => { const { value, checked } = e.target; if (value === "ALL_FACILITIES") { diff --git a/frontend/src/app/commonComponents/Checkboxes.tsx b/frontend/src/app/commonComponents/Checkboxes.tsx index f28ab034a7..26efa13722 100644 --- a/frontend/src/app/commonComponents/Checkboxes.tsx +++ b/frontend/src/app/commonComponents/Checkboxes.tsx @@ -87,7 +87,7 @@ const Checkboxes = (props: Props) => { return (
@@ -128,11 +128,12 @@ const CheckboxesFragment = (props: FragmentProps) => { const { boxes, name, inputRef, onChange } = props; return boxes.map(({ value, label, disabled, checked, ...inputProps }) => ( -
+
{ disabled={disabled || props.disabled} {...inputProps} /> -
diff --git a/frontend/src/app/signUp/Organization/__snapshots__/UnsupportedStateModal.test.tsx.snap b/frontend/src/app/signUp/Organization/__snapshots__/UnsupportedStateModal.test.tsx.snap index 4576503626..45b529f3b4 100644 --- a/frontend/src/app/signUp/Organization/__snapshots__/UnsupportedStateModal.test.tsx.snap +++ b/frontend/src/app/signUp/Organization/__snapshots__/UnsupportedStateModal.test.tsx.snap @@ -63,7 +63,7 @@ Object { You can join the waitlist to be notified when SimpleReport is available in your state, or if your organization is reporting to a SimpleReport state, you can continue.