From 4abf4068a916381c7370531da420a0115c72b9bd Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Mon, 16 Jun 2025 20:30:44 -0400
Subject: [PATCH] Improving code coverage

---
 tests/javascripts/timeoutPopup.test.js | 52 ++++++++------------------
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/tests/javascripts/timeoutPopup.test.js b/tests/javascripts/timeoutPopup.test.js
index 546f39498..b1329c035 100644
--- a/tests/javascripts/timeoutPopup.test.js
+++ b/tests/javascripts/timeoutPopup.test.js
@@ -70,61 +70,39 @@ describe('The session timer ', () => {
   });
 
   test('signoutUser method logs the user out', () => {
-    // Replace the real function with a fake one we can track
-    const originalSignoutUser = window.GOVUK.Modules.TimeoutPopup.signoutUser;
-    const mockSignoutUser = jest.fn(() => {
-      // Do what the real function would do
-      window.location.href = '/sign-out';
-    });
-
-    window.GOVUK.Modules.TimeoutPopup.signoutUser = mockSignoutUser;
+    const restore = mockWindowLocation();
 
+    // Test the actual function, not a mock
     const signoutUserMethod = window.GOVUK.Modules.TimeoutPopup.signoutUser;
-    signoutUserMethod();
 
-    expect(mockSignoutUser).toHaveBeenCalled();
+    // This will try to set location.href but our mock will catch it
+    expect(() => signoutUserMethod()).not.toThrow();
 
-    // Put the real function back
-    window.GOVUK.Modules.TimeoutPopup.signoutUser = originalSignoutUser;
+    restore();
   });
 
   test('expireUserSession method logs the user out with next query parameter', () => {
-    // Replace this function too so we can check it gets called
-    const originalExpireUserSession = window.GOVUK.Modules.TimeoutPopup.expireUserSession;
-    const mockExpireUserSession = jest.fn(() => {
-      // Build the sign out URL just like the real function
-      const signOutLink = '/sign-out?next=' + window.location.pathname;
-      window.location.href = signOutLink;
-    });
-
-    window.GOVUK.Modules.TimeoutPopup.expireUserSession = mockExpireUserSession;
+    const restore = mockWindowLocation();
 
+    // Test the actual function, not a mock
     const expireUserSessionMethod = window.GOVUK.Modules.TimeoutPopup.expireUserSession;
-    expireUserSessionMethod();
 
-    expect(mockExpireUserSession).toHaveBeenCalled();
+    // This will try to set location.href but our mock will catch it
+    expect(() => expireUserSessionMethod()).not.toThrow();
 
-    // Put the original function back
-    window.GOVUK.Modules.TimeoutPopup.expireUserSession = originalExpireUserSession;
+    restore();
   });
 
   test('extendSession method reloads the page', () => {
-    // Same deal with the extend session function
-    const originalExtendSession = window.GOVUK.Modules.TimeoutPopup.extendSession;
-    const mockExtendSession = jest.fn(() => {
-      // Just reload the page like the real function
-      window.location.reload();
-    });
-
-    window.GOVUK.Modules.TimeoutPopup.extendSession = mockExtendSession;
+    const restore = mockWindowLocation();
 
+    // Test the actual function, not a mock
     const extendSessionMethod = window.GOVUK.Modules.TimeoutPopup.extendSession;
-    extendSessionMethod();
 
-    expect(mockExtendSession).toHaveBeenCalled();
+    // This will try to call location.reload but our mock will catch it
+    expect(() => extendSessionMethod()).not.toThrow();
 
-    // Clean up after ourselves
-    window.GOVUK.Modules.TimeoutPopup.extendSession = originalExtendSession;
+    restore();
   });
 
   test('showTimer method shows the session timer modal', () => {