From 839e299e12b8296fbb0b04a91984ba8a1833f44e Mon Sep 17 00:00:00 2001
From: Tim Deschryver <28659384+timdeschryver@users.noreply.github.com>
Date: Mon, 31 Aug 2026 20:27:47 +0200
Subject: [PATCH 1/2] test(data): re-enable skipped tests

---
 .../entity-collection-service.spec.ts            | 16 +++++++++++-----
 .../reducers/entity-change-tracker-base.spec.ts  |  8 --------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/modules/data/spec/entity-services/entity-collection-service.spec.ts b/modules/data/spec/entity-services/entity-collection-service.spec.ts
index 5fae13db35..72cfd05c09 100644
--- a/modules/data/spec/entity-services/entity-collection-service.spec.ts
+++ b/modules/data/spec/entity-services/entity-collection-service.spec.ts
@@ -273,10 +273,9 @@ describe('EntityCollectionService', () => {
       }));
   });
 
-  describe.skip('saves (optimistic)', () => {
+  describe('saves (optimistic)', () => {
     beforeEach(() => {
       TestBed.configureTestingModule({
-        /* eslint-disable-next-line @typescript-eslint/no-use-before-define */
         providers: [
           {
             provide: EntityDispatcherDefaultOptions,
@@ -289,10 +288,9 @@ describe('EntityCollectionService', () => {
     combinedSaveTests(true);
   });
 
-  describe.skip('saves (pessimistic)', () => {
+  describe('saves (pessimistic)', () => {
     beforeEach(() => {
       TestBed.configureTestingModule({
-        /* eslint-disable-next-line @typescript-eslint/no-use-before-define */
         providers: [
           {
             provide: EntityDispatcherDefaultOptions,
@@ -517,7 +515,15 @@ function entityServicesSetup() {
 
   TestBed.configureTestingModule({
     imports: [
-      StoreModule.forRoot({}),
+      StoreModule.forRoot(
+        {},
+        {
+          runtimeChecks: {
+            // @ngrx/data sets the error on the action when a reducer throws
+            strictActionImmutability: false,
+          },
+        }
+      ),
       EffectsModule.forRoot([]),
       EntityDataModule.forRoot({
         entityMetadata: entityMetadata,
diff --git a/modules/data/spec/reducers/entity-change-tracker-base.spec.ts b/modules/data/spec/reducers/entity-change-tracker-base.spec.ts
index 81ccc15c43..b67c5bf178 100644
--- a/modules/data/spec/reducers/entity-change-tracker-base.spec.ts
+++ b/modules/data/spec/reducers/entity-change-tracker-base.spec.ts
@@ -253,14 +253,6 @@ describe('EntityChangeTrackerBase', () => {
     });
   });
 
-  describe.skip('#mergeSaveDeletes', () => {
-    // TODO: add some tests
-  });
-
-  describe.skip('#mergeSaveUpdates', () => {
-    // TODO: add some tests
-  });
-
   describe('#mergeSaveUpserts', () => {
     it('should use default overwrite changes strategy', () => {
       let {

From a2f0f8d1b0eba7f0988068a0e45e4a81620b9a86 Mon Sep 17 00:00:00 2001
From: Tim Deschryver <28659384+timdeschryver@users.noreply.github.com>
Date: Mon, 31 Aug 2026 20:31:22 +0200
Subject: [PATCH 2/2] test(router-store): re-enable skipped tests

---
 modules/router-store/spec/integration.spec.ts | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/modules/router-store/spec/integration.spec.ts b/modules/router-store/spec/integration.spec.ts
index 3ac84d03e8..399763a632 100644
--- a/modules/router-store/spec/integration.spec.ts
+++ b/modules/router-store/spec/integration.spec.ts
@@ -141,42 +141,6 @@ describe('integration spec', () => {
         });
     }));
 
-  test.skip('should support preventing navigation', () =>
-    new Promise<void>((done) => {
-      const reducer = (state = '', action: RouterAction<any>) => {
-        if (
-          action.type === ROUTER_NAVIGATION &&
-          action.payload.routerState.url.toString() === '/next'
-        ) {
-          throw new Error('You shall not pass!');
-        } else {
-          return state;
-        }
-      };
-
-      createTestModule({ reducers: { reducer } });
-
-      const router = TestBed.inject(Router);
-      const log = logOfRouterAndActionsAndStore();
-
-      router
-        .navigateByUrl('/')
-        .then(() => {
-          log.splice(0);
-          return router.navigateByUrl('next');
-        })
-        .catch((e) => {
-          expect(e.message).toEqual('You shall not pass!');
-          expect(log).toEqual([
-            { type: 'router', event: 'NavigationStart', url: '/next' },
-            { type: 'router', event: 'RoutesRecognized', url: '/next' },
-            { type: 'router', event: 'NavigationError', url: '/next' },
-          ]);
-
-          done();
-        });
-    }));
-
   it('should ignore routing actions for the URL that is currently open', async () => {
     createTestModule({
       reducers: { router: routerReducer },