fixed conflicting files

PalisadoesFoundation · Jan 5, 2024 · 019d3d2 · 019d3d2
1 parent 4dc4c78
commit 019d3d2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 30 deletions.
diff --git a/src/screens/OrgList/OrgList.test.tsx b/src/screens/OrgList/OrgList.test.tsx
@@ -176,35 +176,6 @@ describe('Organisations Page testing as SuperAdmin', () => {
 
     userEvent.click(screen.getByTestId(/submitOrganizationForm/i));
   }, 10000);
-
-  test('Testing Plugin Notification Modal after Org is Created is working', async () => {
-    localStorage.setItem('id', '123');
-    localStorage.setItem('UserType', 'SUPERADMIN');
-    await act(async () => {
-      render(
-        <MockedProvider addTypename={false} link={link}>
-          <BrowserRouter>
-            <Provider store={store}>
-              <OrgList />
-            </Provider>
-          </BrowserRouter>
-        </MockedProvider>
-      );
-
-      await wait(500);
-
-      expect(localStorage.setItem).toHaveBeenLastCalledWith(
-        'UserType',
-        'SUPERADMIN'
-      );
-
-      userEvent.click(screen.getByTestId(/closeModalBtn/i));
-      await wait(500);
-    });
-
-    expect(screen.getByTestId(/closeModalBtn/i)).toBeInTheDocument();
-    userEvent.click(screen.getByTestId(/closeModalBtn/i));
-  }, 10000);
 });
 
 describe('Organisations Page testing as Admin', () => {

diff --git a/src/screens/OrgList/OrgList.tsx b/src/screens/OrgList/OrgList.tsx
@@ -597,7 +597,7 @@ function orgList(): JSX.Element {
                   <Button
                     variant="secondary"
                     onClick={closeDialogModal}
-                    data-testid="closeModalBtn"
+                    data-testid="submitOrganizationForm"
                   >
                     <i
                       className="fa fa-times"