From f257a38084dc10c9f86d7e06b81793003b4ce981 Mon Sep 17 00:00:00 2001
From: Andrew Shumway <ashumway@flexion.us>
Date: Wed, 13 Sep 2023 12:44:40 -0600
Subject: [PATCH] Refactor code/initial tests

---
 app/assets/javascripts/timeoutPopup.js | 12 +++-----
 app/templates/admin_template.html      | 41 --------------------------
 tests/javascripts/timeoutPopup.test.js | 18 +++++++++++
 3 files changed, 22 insertions(+), 49 deletions(-)
 create mode 100644 tests/javascripts/timeoutPopup.test.js

diff --git a/app/assets/javascripts/timeoutPopup.js b/app/assets/javascripts/timeoutPopup.js
index af9a9d1cb..0a98ea3d7 100644
--- a/app/assets/javascripts/timeoutPopup.js
+++ b/app/assets/javascripts/timeoutPopup.js
@@ -12,21 +12,17 @@
             var seconds = Math.floor((difference % (1000 * 60)) / 1000);
             document.getElementById("timeLeft").innerHTML = + minutes + "m " + seconds + "s";
             showTimer();
-            document.getElementById("logOutTimer").addEventListener("click", logoutByUser);
+            document.getElementById("logOutTimer").addEventListener("click", logoutUser);
             document.getElementById("extendSessionTimer").addEventListener("click", extendSession);
             if (difference < 0) {
                 clearInterval(x);
                 closeTimer();
-                redirectToSignin();
+                logoutUser();
             }
         }, 1000);
-    }, 60 * 1000);
+    }, 25 * 60 * 1000);
 
-    function redirectToSignin() {
-        window.location.href = '/sign-in';
-    }
-
-    function logoutByUser() {
+    function logoutUser() {
         window.location.href = '/sign-out';
     }
 
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 86a9847c3..8a7aa49b1 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -11,47 +11,6 @@
 {% endblock %}
 
 {% block head %}
-{#    {% if current_user.is_authenticated %}#}
-{#    {% block sessionUserWarning %}#}
-{#    <dialog class="usa-modal" id="sessionTimer" aria-labelledby="sessionTimerHeading" aria-describedby="timerWarning">#}
-{#      <div class="usa-modal__content">#}
-{#        <div class="usa-modal__main">#}
-{#          <h2 class="usa-modal__heading" id="sessionTimerHeading">#}
-{#            Your session will end soon.#}
-{#          </h2>#}
-{#          <div class="usa-prose">#}
-{#            <p aria-live="polite" id="timerWarning">#}
-{#            </p>#}
-{#          </div>#}
-{#          <div class="usa-modal__footer">#}
-{#            <ul class="usa-button-group">#}
-{#              <li class="usa-button-group__item">#}
-{#                <button type="button" class="usa-button usa-button--unstyled" id="extendSessionTimer" data-close-modal>#}
-{#                  Extend Session#}
-{#                </button>#}
-{#              </li>#}
-{#              <li class="usa-button-group__item">#}
-{#                <button type="button" class="usa-button usa-button--unstyled padding-105 text-center" id="logOutTimer" data-close-modal>#}
-{#                  Sign out#}
-{#                </button>#}
-{#              </li>#}
-{#            </ul>#}
-{#          </div>#}
-{#          <button type="button" class="usa-button usa-modal__close" aria-label="Close this window">#}
-{#            <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">#}
-{#              <use xlink:href="/assets/img/usa-icons/close.svg"></use>#}
-{#            </svg>#}
-{#          </button>#}
-{#        </div>#}
-{#      </div>#}
-{#    </dialog>#}
-{#    <!-- <dialog id="sessionTimer">#}
-{#        <p aria-live="polite" id="timerWarning"></p>#}
-{#        <button class="usa-button" id="logOutTimer">Log Out</button>#}
-{#        <button class="usa-button" id="extendSessionTimer">Extend Session</button>#}
-{#    </dialog> -->#}
-{#    {% endblock %}#}
-{#    {% endif %}#}
   {%- for font in font_paths %}
   <link rel="preload" href="{{ asset_url(font, with_querystring_hash=False) }}" as="font" type="font/woff2" crossorigin>
   {%- endfor %}
diff --git a/tests/javascripts/timeoutPopup.test.js b/tests/javascripts/timeoutPopup.test.js
new file mode 100644
index 000000000..a91e667ea
--- /dev/null
+++ b/tests/javascripts/timeoutPopup.test.js
@@ -0,0 +1,18 @@
+const timeoutPopup = require('../../app/assets/javascripts/timeoutPopup.js');
+
+
+describe('Test popup process', () => {
+    beforeEach(() => {
+        jest.useFakeTimers();
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+    });
+
+    it('Test timers work', () => {
+        jest.runAllTimers();
+    });
+
+}); 
+