Merge pull request #557 from logion-network/feature/test-feedback

Test feedback
logion-network · Mar 28, 2024 · 4462a76 · 4462a76
2 parents 828edf6 + b182e1b
commit 4462a76
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/src/loc/CollectionLocRequest.test.tsx b/src/loc/CollectionLocRequest.test.tsx
@@ -24,7 +24,7 @@ describe("CollectionLocRequest", () => {
 
         await selectLegalOfficer();
         await fillInForm();
-        await clickByName("Submit");
+        await clickByName("Create Draft");
 
         await waitFor(() => expect(navigate).toBeCalledWith(`/user/loc/collection/${locId.toString()}`));
     });
@@ -33,35 +33,33 @@ describe("CollectionLocRequest", () => {
 
         setupLocsState([]);
         render(<CollectionLocRequest backPath="back" />);
-        await waitFor(() => {
-            expect(screen.getByRole("button", { name: "Submit" })).toBeDisabled();
-            expect(screen.getByRole("button", { name: "Request an Identity Protection" })).toBeEnabled();
-        });
+        await checkFormDisabled();
     });
 
     it("should disable form submission when no legal officer selected", async  () => {
 
         setupLocsState(twoLegalOfficers);
         render(<CollectionLocRequest backPath="back" />);
-        await waitFor(() => {
-            expect(screen.getByRole("button", { name: "Submit" })).toBeDisabled();
-            expect(screen.getByRole("button", { name: "Request an Identity Protection" })).toBeEnabled();
-        });
+        await checkFormDisabled();
     });
 
     it("should disable form submission when no collection limit selected", async  () => {
 
         setupLocsState(twoLegalOfficers);
         render(<CollectionLocRequest backPath="back" />);
         await selectLegalOfficer();
-        await waitFor(() => {
-            expect(screen.getByRole("button", { name: "Submit" })).toBeDisabled();
-            expect(screen.getByRole("button", { name: "Request an Identity Protection" })).toBeEnabled();
-        });
+        await checkFormDisabled();
     });
 
 })
 
+async function checkFormDisabled() {
+    await waitFor(() => {
+        expect(screen.getByRole("button", { name: "Create Draft" })).toBeDisabled();
+        expect(screen.getByRole("button", { name: "Request an Identity Protection" })).toBeEnabled();
+    });
+}
+
 function setupLocsState(legalOfficersWithValidIdentityLoc: LegalOfficerClass[]) {
     const draftRequest = {
         locId,

diff --git a/src/loc/CollectionLocRequestForm.tsx b/src/loc/CollectionLocRequestForm.tsx
@@ -229,7 +229,7 @@ export default function CollectionLocRequestForm(props: Props) {
 
             <ButtonGroup>
                 <Button disabled={ props.legalOfficer === undefined || !limits.areValid() } type="submit"
-                        onClick={ handleSubmit(submit) }>Submit</Button>
+                        onClick={ handleSubmit(submit) }>Create Draft</Button>
             </ButtonGroup>
 
         </>

diff --git a/src/loc/LocDetailsTab.tsx b/src/loc/LocDetailsTab.tsx
@@ -235,13 +235,12 @@ export function LocDetailsTabContent(props: ContentProps) {
         await mutateLocState(async current => {
             if(current instanceof RejectedRequest) {
                 const next = await current.rework();
-                navigate(backPath);
                 return next.locsState();
             } else {
                 return current;
             }
         });
-    }, [ mutateLocState, navigate, backPath ]);
+    }, [ mutateLocState ]);
 
     if(!loc) {
         return null;