From bf5bcae4ac6cb9927e1ee2c9ec871788c6734d81 Mon Sep 17 00:00:00 2001 From: William Grant Date: Tue, 10 Oct 2023 10:13:27 +1100 Subject: [PATCH] refactor: rename generateDisappearingMessage to generateDisappearingVisibleMessage --- .../unit/disappearing/DisappearingMessage_test.ts | 9 ++++----- ts/test/test-utils/utils/message.ts | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ts/test/session/unit/disappearing/DisappearingMessage_test.ts b/ts/test/session/unit/disappearing/DisappearingMessage_test.ts index 7c4d4e9b0..ef51d1b66 100644 --- a/ts/test/session/unit/disappearing/DisappearingMessage_test.ts +++ b/ts/test/session/unit/disappearing/DisappearingMessage_test.ts @@ -2,7 +2,7 @@ import chai, { expect } from 'chai'; import Sinon from 'sinon'; import chaiAsPromised from 'chai-as-promised'; import { - generateDisappearingMessage, + generateDisappearingVisibleMessage, generateVisibleMessage, stubWindowLog, } from '../../../test-utils/utils'; @@ -362,7 +362,7 @@ describe('Disappearing Messages', () => { expect(expireUpdate?.isOutdated, 'isOutdated should be undefined').to.be.undefined; }); it('if we receive a deleteAfterRead message after 1 minute then it returns those values', async () => { - const disappearingMessage = generateDisappearingMessage({ + const disappearingMessage = generateDisappearingVisibleMessage({ expirationType: 'deleteAfterRead', expireTimer: 60, }); @@ -397,7 +397,7 @@ describe('Disappearing Messages', () => { }); it('if we receive an ExpirationTimerUpdate message for deleteAfterSend after 5 minutes then it returns those values', async () => { const lastDisappearingMessageChangeTimestamp = GetNetworkTime.getNowWithNetworkOffset(); - const expirationTimerUpdateMessage = generateDisappearingMessage({ + const expirationTimerUpdateMessage = generateDisappearingVisibleMessage({ expirationType: 'deleteAfterSend', expireTimer: 300, expirationTimerUpdate: { @@ -438,7 +438,7 @@ describe('Disappearing Messages', () => { }); it('if we receive an outdated ExpirationTimerUpdate message then it should be ignored and is outdated', async () => { const lastDisappearingMessageChangeTimestamp = GetNetworkTime.getNowWithNetworkOffset(); - const expirationTimerUpdateMessage = generateDisappearingMessage({ + const expirationTimerUpdateMessage = generateDisappearingVisibleMessage({ expirationType: 'deleteAfterSend', expireTimer: 300, expirationTimerUpdate: { @@ -571,7 +571,6 @@ describe('Disappearing Messages', () => { 'lastDisappearingMessageChangeTimestamp should match the input value' ).to.equal(lastDisappearingMessageChangeTimestamp); }); - // TODO Continue }); }); diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts index 60d13158a..9d037b1ca 100644 --- a/ts/test/test-utils/utils/message.ts +++ b/ts/test/test-utils/utils/message.ts @@ -123,7 +123,7 @@ export function generateFakeIncomingOpenGroupMessageV4({ }; } -export function generateDisappearingMessage({ +export function generateDisappearingVisibleMessage({ identifier, timestamp, expirationType,