Skip to content

fix: conditionally call log when broadcast enabled #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jagordon wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: conditionally call log when broadcast enabled #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b9ef7b
fix: conditionally call log when broadcast enabled
james-gordon-dwp Jun 19, 2024
f06e1fd
fix: add unit test to broadcast when button clicked
james-gordon-dwp Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/timeout-dialog/timeout-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ function TimeoutDialog($module, $sessionActivityService) {
}

const broadcastSessionActivity = () => {
sessionActivityService.logActivity();
if (settings.synchroniseTabs) {
sessionActivityService.logActivity();
}
};

const listenForSessionActivityAndResetDialogTimer = () => {
Expand Down
18 changes: 17 additions & 1 deletion src/components/timeout-dialog/timeout-dialog.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ describe('/components/timeout-dialog', () => {
utils.ajaxGet.mockReset();
redirectHelper.redirectToUrl.mockReset();
mockSessionActivityService.onActivity.mockReset();
mockSessionActivityService.logActivity.mockReset();
jest.clearAllTimers();
});

Expand Down Expand Up @@ -868,13 +869,28 @@ describe('/components/timeout-dialog', () => {
describe('timeout broadcast feature switch disabled', () => {
beforeEach(() => {
setSynchroniseTabs('false');
setupDialog();
setupDialog({}, {});
});
it('should show dialog, as no callback is registered on the session activity service', () => {
expect(mockSessionActivityService.onActivity).not.toHaveBeenCalled();
expect(mockSessionActivityService.logActivity).not.toHaveBeenCalled();

pretendSecondsHavePassed(780);

expect(dialog.displayDialog).toHaveBeenCalled();
});

it('should not broadcast when clicked', () => {
expect(mockSessionActivityService.onActivity).not.toHaveBeenCalled();
expect(mockSessionActivityService.logActivity).not.toHaveBeenCalled();

pretendSecondsHavePassed(780);

clickElem(testScope.latestDialog$element.querySelector('#hmrc-timeout-keep-signin-btn'));

expect(mockSessionActivityService.onActivity).not.toHaveBeenCalled();
expect(mockSessionActivityService.logActivity).not.toHaveBeenCalled();

expect(dialog.displayDialog).toHaveBeenCalled();
});
});
Expand Down