-
Notifications
You must be signed in to change notification settings - Fork 467
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade angular to v18 and Nx (#29919)
### Parent Issue #28714 ### Proposed Changes * Upgrade to Angular v18 * Fix some unit tests * Replace `async` with `waitForAsync` * Avoid HttModule migration ### Checklist - [x] Tests - [x] Translations - [x] Security Implications Contemplated (add notes if applicable)
- Loading branch information
Showing
7 changed files
with
1,821 additions
and
1,605 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
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
19 changes: 9 additions & 10 deletions
19
core-web/libs/portlets/dot-experiments/portlet/src/test-setup.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
import 'jest-preset-angular/setup-jest'; | ||
|
||
import { SplitButtonMockComponent, SplitButtonMockModule } from '@dotcms/utils-testing'; | ||
|
||
/* | ||
* This is a workaround for the following PrimeNg issue: https://github.com/primefaces/primeng/issues/12945 | ||
* They already fixed it, but it's not in the latest v15 LTS yet: https://github.com/primefaces/primeng/pull/13597 | ||
*/ | ||
jest.mock('primeng/splitbutton', () => ({ | ||
SplitButtonModule: SplitButtonMockModule, | ||
SplitButton: SplitButtonMockComponent | ||
})); | ||
// Workaround for the following issue: | ||
// https://github.com/jsdom/jsdom/issues/2177#issuecomment-1724971596 | ||
const originalConsoleError = console.error; | ||
const jsDomCssError = 'Error: Could not parse CSS stylesheet'; | ||
console.error = (...params) => { | ||
if (!params.find((p) => p.toString().includes(jsDomCssError))) { | ||
originalConsoleError(...params); | ||
} | ||
}; |
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
Oops, something went wrong.