fix: use generated pubkeys

in disappearing message tests
pull/2971/head
William Grant 2 years ago
parent bb95aef2d0
commit cc01da5a8a

@ -1,12 +1,11 @@
import chai, { expect } from 'chai'; import chai, { expect } from 'chai';
import Sinon from 'sinon';
import chaiAsPromised from 'chai-as-promised'; import chaiAsPromised from 'chai-as-promised';
import { import Sinon from 'sinon';
generateDisappearingVisibleMessage, import { ConversationModel } from '../../../../models/conversation';
generateFakeExpirationTimerUpdate, import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
generateFakeIncomingPrivateMessage, import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime';
generateVisibleMessage, import { UserUtils } from '../../../../session/utils';
} from '../../../test-utils/utils'; import { isValidUnixTimestamp } from '../../../../session/utils/Timestamps';
import { import {
DisappearingMessageConversationModeType, DisappearingMessageConversationModeType,
DisappearingMessageType, DisappearingMessageType,
@ -15,21 +14,24 @@ import {
checkForExpireUpdateInContentMessage, checkForExpireUpdateInContentMessage,
setExpirationStartTimestamp, setExpirationStartTimestamp,
} from '../../../../util/expiringMessages'; } from '../../../../util/expiringMessages';
import { isValidUnixTimestamp } from '../../../../session/utils/Timestamps';
import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime';
import { ConversationModel } from '../../../../models/conversation';
import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
import { UserUtils } from '../../../../session/utils';
import { ReleasedFeatures } from '../../../../util/releaseFeature'; import { ReleasedFeatures } from '../../../../util/releaseFeature';
import { TestUtils } from '../../../test-utils'; import { TestUtils } from '../../../test-utils';
import {
generateDisappearingVisibleMessage,
generateFakeExpirationTimerUpdate,
generateFakeIncomingPrivateMessage,
generateVisibleMessage,
} from '../../../test-utils/utils';
chai.use(chaiAsPromised as any); chai.use(chaiAsPromised as any);
const testPubkey = TestUtils.generateFakePubKeyStr();
describe('Disappearing Messages', () => { describe('Disappearing Messages', () => {
const getLatestTimestampOffset = 200000; const getLatestTimestampOffset = 200000;
const ourNumber = '051234567890acbdef'; const ourNumber = TestUtils.generateFakePubKeyStr();
const conversationArgs = { const conversationArgs = {
id: '050123456789abcdef050123456789abcdef0123456789abcdef050123456789ab', id: testPubkey,
type: ConversationTypeEnum.PRIVATE, type: ConversationTypeEnum.PRIVATE,
isApproved: true, isApproved: true,
active_at: 123, active_at: 123,
@ -403,7 +405,7 @@ describe('Disappearing Messages', () => {
expirationType: 'deleteAfterSend', expirationType: 'deleteAfterSend',
expireTimer: 300, expireTimer: 300,
lastDisappearingMessageChangeTimestamp, lastDisappearingMessageChangeTimestamp,
source: '050123456789abcdef050123456789abcdef0123456789abcdef050123456789ab', source: testPubkey,
}, },
}); });
@ -444,7 +446,7 @@ describe('Disappearing Messages', () => {
expirationType: 'deleteAfterSend', expirationType: 'deleteAfterSend',
expireTimer: 300, expireTimer: 300,
lastDisappearingMessageChangeTimestamp: lastDisappearingMessageChangeTimestamp - 20000, lastDisappearingMessageChangeTimestamp: lastDisappearingMessageChangeTimestamp - 20000,
source: '050123456789abcdef050123456789abcdef0123456789abcdef050123456789ab', source: testPubkey,
}, },
}); });
@ -552,7 +554,7 @@ describe('Disappearing Messages', () => {
providedDisappearingMode: 'deleteAfterSend', providedDisappearingMode: 'deleteAfterSend',
providedExpireTimer: 600, providedExpireTimer: 600,
providedChangeTimestamp: lastDisappearingMessageChangeTimestamp, providedChangeTimestamp: lastDisappearingMessageChangeTimestamp,
providedSource: '050123456789abcdef050123456789abcdef0123456789abcdef050123456789ab', providedSource: testPubkey,
receivedAt: GetNetworkTime.getNowWithNetworkOffset(), receivedAt: GetNetworkTime.getNowWithNetworkOffset(),
fromSync: true, fromSync: true,
shouldCommitConvo: false, shouldCommitConvo: false,
@ -580,7 +582,7 @@ describe('Disappearing Messages', () => {
expirationType: 'deleteAfterSend', expirationType: 'deleteAfterSend',
expireTimer: 300, expireTimer: 300,
lastDisappearingMessageChangeTimestamp: GetNetworkTime.getNowWithNetworkOffset(), lastDisappearingMessageChangeTimestamp: GetNetworkTime.getNowWithNetworkOffset(),
source: '050123456789abcdef050123456789abcdef0123456789abcdef050123456789ab', source: testPubkey,
}); });
expect(expirationTimerUpdateMessage.get('flags'), 'flags should be 2').to.equal(2); expect(expirationTimerUpdateMessage.get('flags'), 'flags should be 2').to.equal(2);

Loading…
Cancel
Save