Skip to content

fix: resolve Frontend Unit Tests CI timeout and cancellations #34196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfreudenthaler merged 5 commits into from
Jan 2, 2026
+9 −8
Merged

fix: resolve Frontend Unit Tests CI timeout and cancellations #34196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d7647c
fix: minimal fix for Frontend Unit Tests - TypeScript API + leak dete…
sfreudenthaler Dec 31, 2025
8e5d16b
fix: correct Maven command line syntax for Yarn nx affected
sfreudenthaler Dec 31, 2025
e2a0ef9
fix: add --forceExit to show detected open handles
sfreudenthaler Dec 31, 2025
bd39aec
fix: update test mocks for getCurrentNavigation API change
sfreudenthaler Jan 1, 2026
c8d80c7
Update core-web/pom.xml
sfreudenthaler Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core-web/apps/dotcms-ui/src/app/api/services/guards/ema-app/edit-page.guard.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('EditPageGuard', () => {
provide: Router,
useValue: {
navigate: jest.fn(),
currentNavigation: jest.fn().mockReturnValue({
getCurrentNavigation: jest.fn().mockReturnValue({
extractedUrl: {
queryParams: {
url: '/some-url'
Expand Down
2 changes: 1 addition & 1 deletion core-web/apps/dotcms-ui/src/app/api/services/guards/ema-app/edit-page.guard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const editPageGuard: CanMatchFn = () => {

const router = inject(Router);

const url = router.currentNavigation().extractedUrl.queryParams['url'];
const url = router.getCurrentNavigation().extractedUrl.queryParams['url'];

return combineLatest([
properties.getFeatureFlag(FeaturedFlags.FEATURE_FLAG_NEW_EDIT_PAGE),
Expand Down
2 changes: 1 addition & 1 deletion .../dotcms-ui/src/app/view/components/dot-navigation/services/dot-navigation.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class RouterMock {

url = '';

currentNavigation() {
getCurrentNavigation() {
return this._currentNavigation;
}

Expand Down
6 changes: 3 additions & 3 deletions core-web/libs/data-access/src/lib/dot-router/dot-router.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class RouterMock {
return this._events.asObservable();
}

currentNavigation(): { finalUrl: { queryParams: { [key: string]: string } } } | null {
getCurrentNavigation(): { finalUrl: { queryParams: { [key: string]: string } } } | null {
return {
finalUrl: {
queryParams: {}
Expand Down Expand Up @@ -100,7 +100,7 @@ describe('DotRouterService', () => {
});

it('should get queryParams from Router', () => {
jest.spyOn(router, 'currentNavigation').mockReturnValue({
jest.spyOn(router, 'getCurrentNavigation').mockReturnValue({
finalUrl: {
queryParams: {
hola: 'mundo'
Expand All @@ -114,7 +114,7 @@ describe('DotRouterService', () => {
});

it('should get queryParams from ActivatedRoute', () => {
jest.spyOn(router, 'currentNavigation').mockReturnValue(null);
jest.spyOn(router, 'getCurrentNavigation').mockReturnValue(null);
expect(service.queryParams).toEqual({
hello: 'world'
});
Expand Down
2 changes: 1 addition & 1 deletion core-web/libs/data-access/src/lib/dot-router/dot-router.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export class DotRouterService {
}

get queryParams(): Params {
const nav = this.router.currentNavigation();
const nav = this.router.getCurrentNavigation();

return nav ? nav.finalUrl.queryParams : this.route.snapshot.queryParams;
}
Expand Down
3 changes: 2 additions & 1 deletion core-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@

<configuration>
<skip>${skipTests}</skip>
<arguments>nx affected -t test --base=origin/main --exclude='tag:skip:test'</arguments>
<!-- Add detectOpenHandles to identify resource leaks, forceExit to show results -->
<arguments>nx affected -t test --base=origin/main --exclude='tag:skip:test' --detectOpenHandles --forceExit</arguments>
</configuration>
</execution>

Expand Down