diff --git a/app/assets/javascripts/timeoutPopup.js b/app/assets/javascripts/timeoutPopup.js index 0a98ea3d7..20a6e2eed 100644 --- a/app/assets/javascripts/timeoutPopup.js +++ b/app/assets/javascripts/timeoutPopup.js @@ -1,6 +1,6 @@ -(function(global) { +const sessionTimerWrapper = function() { "use strict"; - + (function(global) { const sessionTimer = document.getElementById("sessionTimer"); setTimeout(function() { @@ -20,7 +20,7 @@ logoutUser(); } }, 1000); - }, 25 * 60 * 1000); + }, 60 * 1000); function logoutUser() { window.location.href = '/sign-out'; @@ -37,5 +37,11 @@ function closeTimer() { sessionTimer.close(); } + })(window); +}; -})(window); +module.exports = sessionTimerWrapper; + +(function(){ + sessionTimerWrapper(); +})(); diff --git a/tests/javascripts/timeoutPopup.test.js b/tests/javascripts/timeoutPopup.test.js index a91e667ea..bd6c57803 100644 --- a/tests/javascripts/timeoutPopup.test.js +++ b/tests/javascripts/timeoutPopup.test.js @@ -1,4 +1,4 @@ -const timeoutPopup = require('../../app/assets/javascripts/timeoutPopup.js'); +const sessionTimerWrapper = require('../../app/assets/javascripts/timeoutPopup.js'); describe('Test popup process', () => { @@ -12,6 +12,7 @@ describe('Test popup process', () => { it('Test timers work', () => { jest.runAllTimers(); + sessionTimerWrapper(); }); });