mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-17 04:59:37 -04:00
Removed all govuk css (#2814)
* Removed all govuk css * Updated reference files * Removing govuk js * Fixed casing for modules, removed unused page * Got more reference images * Updated template page * Removed govuk padding util * Updated hint to uswds hint * More govuk cleanup * Commiting backstopjs ref files * Fixed all unit tests that broke due to brittleness around govuk styling * Added new ref images * Final removal of govuk * Officially removed all govuk references * Updated reference file * Updated link to button * UI modernization * Cleanup * removed govuk escaping tests since they are no longer needed * Fix CodeQL security issue in escapeElementName function - Escape backslashes first before other special characters - Prevents potential double-escaping vulnerability - Addresses CodeQL alert about improper string escaping * Found more govuk removal. Fixed unit tests * Add missing pipeline check to pre-commit * updated test * Updated e2e test * More update to e2e test * Fixed another e2e test * Simple PR comments addressed * More updates * Updated backstop ref files * Refactored folder selection for non-admins * Updated redundant line * Updated tests to include correct mocks * Added more ref files * Addressing carlos comments * Addressing Carlo comments, cleanup of window initing * More cleanup and addressing carlo comments * Fixing a11 scan * Fixed a few issues with javascript * Fixed for pr * Fixing e2e tests * Tweaking e2e test * Added more ref files and cleaned up urls.js * Fixed bug with creating new template * Removed brittle test - addressed code ql comment * e2e race condition fix * More e2e test fixes * Updated e2e tests to not wait for text sent * Updated test to not wait for button click response * Made tear down more resilent if staging is down * reverted e2e test to what was working before main merge * Updated backstopRef images * Updated gulp to include job-polling differently
This commit is contained in:
@@ -35,7 +35,7 @@ beforeAll(() => {
|
||||
`;
|
||||
|
||||
const sessionTimerModule = require('../../app/assets/javascripts/timeoutPopup.js');
|
||||
window.GOVUK.modules.start();
|
||||
window.NotifyModules.start();
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
@@ -73,7 +73,7 @@ describe('The session timer ', () => {
|
||||
const restore = mockWindowLocation();
|
||||
|
||||
// Test the actual function, not a mock
|
||||
const signoutUserMethod = window.GOVUK.Modules.TimeoutPopup.signoutUser;
|
||||
const signoutUserMethod = window.NotifyModules.TimeoutPopup.signoutUser;
|
||||
|
||||
// This will try to set location.href but our mock will catch it
|
||||
expect(() => signoutUserMethod()).not.toThrow();
|
||||
@@ -85,7 +85,7 @@ describe('The session timer ', () => {
|
||||
const restore = mockWindowLocation();
|
||||
|
||||
// Test the actual function, not a mock
|
||||
const expireUserSessionMethod = window.GOVUK.Modules.TimeoutPopup.expireUserSession;
|
||||
const expireUserSessionMethod = window.NotifyModules.TimeoutPopup.expireUserSession;
|
||||
|
||||
// This will try to set location.href but our mock will catch it
|
||||
expect(() => expireUserSessionMethod()).not.toThrow();
|
||||
@@ -97,7 +97,7 @@ describe('The session timer ', () => {
|
||||
const restore = mockWindowLocation();
|
||||
|
||||
// Test the actual function, not a mock
|
||||
const extendSessionMethod = window.GOVUK.Modules.TimeoutPopup.extendSession;
|
||||
const extendSessionMethod = window.NotifyModules.TimeoutPopup.extendSession;
|
||||
|
||||
// This will try to call location.reload but our mock will catch it
|
||||
expect(() => extendSessionMethod()).not.toThrow();
|
||||
@@ -111,7 +111,7 @@ describe('The session timer ', () => {
|
||||
|
||||
const showTimerMock = jest.spyOn(sessionTimer, 'showModal');
|
||||
|
||||
window.GOVUK.Modules.TimeoutPopup.showTimer();
|
||||
window.NotifyModules.TimeoutPopup.showTimer();
|
||||
|
||||
expect(showTimerMock).toHaveBeenCalled();
|
||||
});
|
||||
@@ -122,17 +122,17 @@ describe('The session timer ', () => {
|
||||
|
||||
const closeTimerMock = jest.spyOn(sessionTimer, 'close');
|
||||
|
||||
window.GOVUK.Modules.TimeoutPopup.closeTimer();
|
||||
window.NotifyModules.TimeoutPopup.closeTimer();
|
||||
|
||||
expect(closeTimerMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('checkTimer is called', () => {
|
||||
const checkTimerMock = jest.spyOn(
|
||||
window.GOVUK.Modules.TimeoutPopup,
|
||||
window.NotifyModules.TimeoutPopup,
|
||||
'checkTimer'
|
||||
);
|
||||
window.GOVUK.Modules.TimeoutPopup.checkTimer();
|
||||
window.NotifyModules.TimeoutPopup.checkTimer();
|
||||
expect(checkTimerMock).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user