From c3e114e36f7e9d161a74191e18c0802cf6fc87d0 Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:14:49 -0500
Subject: [PATCH] Update Expectations of `update` method (#7119)

* Update Expectations of `update` method

Change `update` to return current state
when `shouldUpdate` returns false.

* Delete Accidental Tests
---
 libs/common/spec/fake-state.ts                                | 4 ++--
 .../state/implementations/default-active-user-state.spec.ts   | 2 +-
 .../state/implementations/default-active-user-state.ts        | 2 +-
 .../state/implementations/default-global-state.spec.ts        | 2 +-
 .../platform/state/implementations/default-global-state.ts    | 2 +-
 .../state/implementations/default-single-user-state.spec.ts   | 2 +-
 .../state/implementations/default-single-user-state.ts        | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/common/spec/fake-state.ts b/libs/common/spec/fake-state.ts
index 42fa498ffd8..2d455fe2378 100644
--- a/libs/common/spec/fake-state.ts
+++ b/libs/common/spec/fake-state.ts
@@ -48,7 +48,7 @@ export class FakeGlobalState<T> implements GlobalState<T> {
         ? await firstValueFrom(options.combineLatestWith.pipe(timeout(options.msTimeout)))
         : null;
     if (!options.shouldUpdate(current, combinedDependencies)) {
-      return;
+      return current;
     }
     const newState = configureState(current, combinedDependencies);
     this.stateSubject.next(newState);
@@ -77,7 +77,7 @@ export class FakeUserState<T> implements UserState<T> {
         ? await firstValueFrom(options.combineLatestWith.pipe(timeout(options.msTimeout)))
         : null;
     if (!options.shouldUpdate(current, combinedDependencies)) {
-      return;
+      return current;
     }
     const newState = configureState(current, combinedDependencies);
     this.stateSubject.next(newState);
diff --git a/libs/common/src/platform/state/implementations/default-active-user-state.spec.ts b/libs/common/src/platform/state/implementations/default-active-user-state.spec.ts
index 8b4d8edb6b8..065f7a8e959 100644
--- a/libs/common/src/platform/state/implementations/default-active-user-state.spec.ts
+++ b/libs/common/src/platform/state/implementations/default-active-user-state.spec.ts
@@ -301,7 +301,7 @@ describe("DefaultActiveUserState", () => {
       await awaitAsync();
 
       expect(diskStorageService.mock.save).not.toHaveBeenCalled();
-      expect(result).toBe(undefined);
+      expect(result).toBeNull();
       expect(emissions).toEqual([null]);
     });
 
diff --git a/libs/common/src/platform/state/implementations/default-active-user-state.ts b/libs/common/src/platform/state/implementations/default-active-user-state.ts
index 6add6f2db80..3d36af1d61c 100644
--- a/libs/common/src/platform/state/implementations/default-active-user-state.ts
+++ b/libs/common/src/platform/state/implementations/default-active-user-state.ts
@@ -122,7 +122,7 @@ export class DefaultActiveUserState<T> implements ActiveUserState<T> {
         : null;
 
     if (!options.shouldUpdate(currentState, combinedDependencies)) {
-      return;
+      return currentState;
     }
 
     const newState = configureState(currentState, combinedDependencies);
diff --git a/libs/common/src/platform/state/implementations/default-global-state.spec.ts b/libs/common/src/platform/state/implementations/default-global-state.spec.ts
index 05eb9a23ea5..ae6cd1adbfd 100644
--- a/libs/common/src/platform/state/implementations/default-global-state.spec.ts
+++ b/libs/common/src/platform/state/implementations/default-global-state.spec.ts
@@ -145,7 +145,7 @@ describe("DefaultGlobalState", () => {
 
       expect(diskStorageService.mock.save).not.toHaveBeenCalled();
       expect(emissions).toEqual([null]); // Initial value
-      expect(result).toBeUndefined();
+      expect(result).toBeNull();
     });
 
     it("should provide the update callback with the current State", async () => {
diff --git a/libs/common/src/platform/state/implementations/default-global-state.ts b/libs/common/src/platform/state/implementations/default-global-state.ts
index f3aea8725d8..8e08717f721 100644
--- a/libs/common/src/platform/state/implementations/default-global-state.ts
+++ b/libs/common/src/platform/state/implementations/default-global-state.ts
@@ -85,7 +85,7 @@ export class DefaultGlobalState<T> implements GlobalState<T> {
         : null;
 
     if (!options.shouldUpdate(currentState, combinedDependencies)) {
-      return;
+      return currentState;
     }
 
     const newState = configureState(currentState, combinedDependencies);
diff --git a/libs/common/src/platform/state/implementations/default-single-user-state.spec.ts b/libs/common/src/platform/state/implementations/default-single-user-state.spec.ts
index 443a176c2e8..a25ee863e6b 100644
--- a/libs/common/src/platform/state/implementations/default-single-user-state.spec.ts
+++ b/libs/common/src/platform/state/implementations/default-single-user-state.spec.ts
@@ -156,7 +156,7 @@ describe("DefaultSingleUserState", () => {
 
       expect(diskStorageService.mock.save).not.toHaveBeenCalled();
       expect(emissions).toEqual([null]); // Initial value
-      expect(result).toBeUndefined();
+      expect(result).toBeNull();
     });
 
     it("should provide the update callback with the current State", async () => {
diff --git a/libs/common/src/platform/state/implementations/default-single-user-state.ts b/libs/common/src/platform/state/implementations/default-single-user-state.ts
index aa9abe6b6c7..46fa00ffb35 100644
--- a/libs/common/src/platform/state/implementations/default-single-user-state.ts
+++ b/libs/common/src/platform/state/implementations/default-single-user-state.ts
@@ -91,7 +91,7 @@ export class DefaultSingleUserState<T> implements SingleUserState<T> {
         : null;
 
     if (!options.shouldUpdate(currentState, combinedDependencies)) {
-      return;
+      return currentState;
     }
 
     const newState = configureState(currentState, combinedDependencies);