-
Notifications
You must be signed in to change notification settings - Fork 272
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Resolve issues arround broken type resolution in test files inside webap-core package - Remove redunant React imports in test files - Use correct testing library package for renderHook - remove conosle warnings - Refresh nx pnpm patch to match new version
- Loading branch information
1 parent
2becfe7
commit 81c8b88
Showing
25 changed files
with
2,555 additions
and
1,190 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
packages/webapp-libs/webapp-core/src/components/alert/__tests__/alert.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 1 addition & 4 deletions
5
packages/webapp-libs/webapp-core/src/components/cards/__tests__/cards.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
packages/webapp-libs/webapp-core/src/components/dialog/__tests__/dialog.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
packages/webapp-libs/webapp-core/src/components/forms/form/__tests__/form.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
...webapp-libs/webapp-core/src/components/pagination/__tests__/pagination.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
packages/webapp-libs/webapp-core/src/components/popover/__tests__/popover.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
...s/webapp-libs/webapp-core/src/components/separator/__tests__/separator.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 2 additions & 3 deletions
5
...ges/webapp-libs/webapp-core/src/components/skeleton/__tests__/skeleton.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,12 @@ | ||
import { screen } from '@testing-library/react'; | ||
import React from 'react'; | ||
import { render } from '../../../tests/utils/rendering'; | ||
|
||
import { Skeleton } from '../'; | ||
import { render } from '../../../tests/utils/rendering'; | ||
|
||
describe('Skeleton', () => { | ||
it('Should render rounded skeleton', async () => { | ||
render(<Skeleton data-testid="testid" className="h-12 w-12 rounded-full" />); | ||
|
||
expect(await screen.getByTestId('testid').className).toContain('h-12 w-12 rounded-full'); | ||
expect(screen.getByTestId('testid').className).toContain('h-12 w-12 rounded-full'); | ||
}); | ||
}); |
1 change: 0 additions & 1 deletion
1
packages/webapp-libs/webapp-core/src/components/table/__tests__/table.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
packages/webapp-libs/webapp-core/src/components/tabs/__tests__/tabs.component.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/webapp-libs/webapp-core/src/hooks/useLocales/__tests__/useLocales.hook.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...libs/webapp-core/src/hooks/useMappedConnection/__tests__/useMappedConnection.hook.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ges/webapp-libs/webapp-core/src/hooks/useMediaQuery/__tests__/useMediaQuery.hook.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/webapp-libs/webapp-core/src/hooks/useOpenState/__tests__/useOpenState.hook.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/webapp-libs/webapp-core/src/hooks/useTheme/__tests__/useTheme.hook.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...app-libs/webapp-core/src/hooks/useWindowListener/__tests__/useWindowListener.hook.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/webapp/plop/reactHook/templates/__tests__/hook.spec.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../webapp/src/shared/hooks/useRouterScrollToTop/__tests__/useRouterScrollToTop.hook.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
diff --git a/src/tasks-runner/run-command.js b/src/tasks-runner/run-command.js | ||
index cd830d3c34639a5d8a52c12b3975e8c309ba8f9b..8300356271db5e2a815d3b51443a5f6682858181 100644 | ||
index 68db405163db9a779d85f376ec2e6af6f08ce084..8c91bd498dc03b20e0c1d56301ce89a1af957756 100644 | ||
--- a/src/tasks-runner/run-command.js | ||
+++ b/src/tasks-runner/run-command.js | ||
@@ -114,7 +114,7 @@ function setEnvVarsBasedOnArgs(nxArgs, loadDotEnvFiles) { | ||
@@ -112,7 +112,7 @@ function setEnvVarsBasedOnArgs(nxArgs, loadDotEnvFiles) { | ||
if (nxArgs.outputStyle == 'stream-without-prefixes') { | ||
process.env.NX_STREAM_OUTPUT = 'true'; | ||
} | ||
- if (loadDotEnvFiles) { | ||
+ if (loadDotEnvFiles && !process.env.NX_LOAD_DOT_ENV_FILES) { | ||
process.env.NX_LOAD_DOT_ENV_FILES = 'true'; | ||
} | ||
} | ||
} |
Oops, something went wrong.