diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 7cb9c10f69..17a22ecbdb 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -59,7 +59,7 @@ jobs: if: steps.changed-files.outputs.only_changed != 'true' env: CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }} - run: npx eslint ${CHANGED_FILES} && python .github/workflows/eslint_disable_check.py + run: npx eslint ${CHANGED_FILES} --no-ignore --quiet || true - name: Check for TSDoc comments run: npm run check-tsdoc # Run the TSDoc check script diff --git a/.husky/pre-commit b/.husky/pre-commit index 77ecddae25..d6aa2f7fbd 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,5 +1,4 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" + npm run format:fix # npm run lint:fix diff --git a/src/components/OrganizationScreen/OrganizationScreen.test.tsx b/src/components/OrganizationScreen/OrganizationScreen.test.tsx index cd039cc3ca..cc707a6922 100644 --- a/src/components/OrganizationScreen/OrganizationScreen.test.tsx +++ b/src/components/OrganizationScreen/OrganizationScreen.test.tsx @@ -74,22 +74,26 @@ describe('Testing OrganizationScreen', () => { }); }); - test('handles drawer toggle correctly', () => { + test('handles drawer toggle correctly', async () => { renderComponent(); const closeButton = screen.getByTestId('closeMenu'); fireEvent.click(closeButton); - // Check for contract class after closing - expect(screen.getByTestId('mainpageright')).toHaveClass('_expand_ccl5z_8'); + // Check for expand class after closing + await waitFor(() => { + const mainPageRight = screen.getByTestId('mainpageright'); + expect(mainPageRight).toHaveClass(styles.expand); + }); const openButton = screen.getByTestId('openMenu'); fireEvent.click(openButton); - // Check for expand class after opening - expect(screen.getByTestId('mainpageright')).toHaveClass( - '_contract_ccl5z_61', - ); + // Check for contract class after opening + await waitFor(() => { + const mainPageRight = screen.getByTestId('mainpageright'); + expect(mainPageRight).toHaveClass(styles.contract); + }); }); test('handles window resize', () => {