keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

test: replace any with ConversationAttributes

Browse Source 
on convo constructor args
pull/2971/head
William Grant 1 year ago
parent 0796460d57
commit 5d98ff6e8b
4 changed files with 70 additions and 62 deletions
Show Stats Download Patch File Download Diff File

63
ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts
Unescape Escape View File

@ -2,7 +2,10 @@ import chai, { expect } from 'chai';
import chaiAsPromised from 'chai-as-promised';
import Sinon from 'sinon';
import { ConversationModel } from '../../../../models/conversation';
import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
import {
ConversationAttributes,
ConversationTypeEnum,
} from '../../../../models/conversationAttributes';
import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime';
import { DisappearingMessages } from '../../../../session/disappearing_messages';
import {
@ -34,7 +37,7 @@ describe('DisappearingMessage', () => {
isApproved: true,
active_at: 123,
didApproveMe: true,
};
} as ConversationAttributes;
beforeEach(() => {
Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset);
@ -116,7 +119,7 @@ describe('DisappearingMessage', () => {
it("if it's a Private Conversation and the expirationMode is off and expireTimer = 0 then the message's expirationType is unknown", async () => {
const conversation = new ConversationModel({
...conversationArgs,
} as any);
});
const expireTimer = 0; // seconds
const expirationMode = 'off';
const messageExpirationType = DisappearingMessages.changeToDisappearingMessageType(
@ -130,7 +133,7 @@ describe('DisappearingMessage', () => {
it("if it's a Private Conversation and the expirationMode is deleteAfterRead and expireTimer > 0 then the message's expirationType is deleteAfterRead", async () => {
const conversation = new ConversationModel({
...conversationArgs,
} as any);
});
const expireTimer = 60; // seconds
const expirationMode = 'deleteAfterRead';
const messageExpirationType = DisappearingMessages.changeToDisappearingMessageType(
@ -144,7 +147,7 @@ describe('DisappearingMessage', () => {
it("if it's a Private Conversation and the expirationMode is deleteAfterSend and expireTimer > 0 then the message's expirationType is deleteAfterSend", async () => {
const conversation = new ConversationModel({
...conversationArgs,
} as any);
});
const expireTimer = 60; // seconds
const expirationMode = 'deleteAfterSend';
const messageExpirationType = DisappearingMessages.changeToDisappearingMessageType(
@ -159,7 +162,7 @@ describe('DisappearingMessage', () => {
const ourConversation = new ConversationModel({
...conversationArgs,
id: ourNumber,
} as any);
});
const expireTimer = 60; // seconds
const expirationMode = 'deleteAfterRead'; // not correct
const messageExpirationType = DisappearingMessages.changeToDisappearingMessageType(
@ -176,7 +179,7 @@ describe('DisappearingMessage', () => {
type: ConversationTypeEnum.GROUP,
// TODO update to 03 prefix when we release new groups
id: '05123456564',
} as any);
});
const expireTimer = 60; // seconds
const expirationMode = 'deleteAfterRead'; // not correct
const messageExpirationType = DisappearingMessages.changeToDisappearingMessageType(
@ -191,7 +194,7 @@ describe('DisappearingMessage', () => {
it("if it's a Private Conversation and the expirationMode is legacy and expireTimer = 0 then the message's expirationType is unknown", async () => {
const conversation = new ConversationModel({
...conversationArgs,
} as any);
});
const expireTimer = 0; // seconds
const expirationMode = 'legacy';
const messageExpirationType = DisappearingMessages.changeToDisappearingMessageType(
@ -205,7 +208,7 @@ describe('DisappearingMessage', () => {
it("if it's a Private Conversation and the expirationMode is undefined and expireTimer > 0 then the message's expirationType is unknown", async () => {
const conversation = new ConversationModel({
...conversationArgs,
} as any);
});
const expireTimer = 0; // seconds
const messageExpirationType = DisappearingMessages.changeToDisappearingMessageType(
conversation,
@ -221,7 +224,7 @@ describe('DisappearingMessage', () => {
const ourConversation = new ConversationModel({
...conversationArgs,
id: ourNumber,
} as any);
});
const expirationType = 'deleteAfterRead'; // not correct
const expireTimer = 60; // seconds
const conversationMode = DisappearingMessages.changeToDisappearingConversationMode(
@ -238,7 +241,7 @@ describe('DisappearingMessage', () => {
type: ConversationTypeEnum.GROUP,
// TODO update to 03 prefix when we release new groups
id: '05123456564',
} as any);
});
const expirationType = 'deleteAfterRead'; // not correct
const expireTimer = 60; // seconds
const conversationMode = DisappearingMessages.changeToDisappearingConversationMode(
@ -252,7 +255,7 @@ describe('DisappearingMessage', () => {
it("if it's a Private Conversation and expirationType is deleteAfterRead and expireTimer > 0 then the conversation mode stays as deleteAfterRead", async () => {
const ourConversation = new ConversationModel({
...conversationArgs,
} as any);
});
const expirationType = 'deleteAfterRead';
const expireTimer = 60; // seconds
const conversationMode = DisappearingMessages.changeToDisappearingConversationMode(
@ -266,7 +269,7 @@ describe('DisappearingMessage', () => {
it("if it's a Private Conversation and expirationType is deleteAfterSend and expireTimer > 0 then the conversation mode stays as deleteAfterSend", async () => {
const ourConversation = new ConversationModel({
...conversationArgs,
} as any);
});
const expirationType = 'deleteAfterSend';
const expireTimer = 60; // seconds
const conversationMode = DisappearingMessages.changeToDisappearingConversationMode(
@ -278,7 +281,7 @@ describe('DisappearingMessage', () => {
expect(conversationMode, 'returns deleteAfterSend').to.be.eq('deleteAfterSend');
});
it('if the type is unknown and expireTimer = 0 then the conversation mode is off', async () => {
const conversation = new ConversationModel({ ...conversationArgs } as any);
const conversation = new ConversationModel({ ...conversationArgs });
const expirationType: DisappearingMessageType = 'unknown';
const expireTimer = 0; // seconds
const conversationMode = DisappearingMessages.changeToDisappearingConversationMode(
@ -290,7 +293,7 @@ describe('DisappearingMessage', () => {
expect(conversationMode, 'returns off').to.be.eq('off');
});
it('if the type is undefined and expireTimer = 0 then the conversation mode is off', async () => {
const conversation = new ConversationModel({ ...conversationArgs } as any);
const conversation = new ConversationModel({ ...conversationArgs });
const expireTimer = 0; // seconds
const conversationMode = DisappearingMessages.changeToDisappearingConversationMode(
conversation,
@ -301,7 +304,7 @@ describe('DisappearingMessage', () => {
expect(conversationMode, 'returns off').to.be.eq('off');
});
it('if the type and expireTimer are undefined then the conversation mode is off', async () => {
const conversation = new ConversationModel({ ...conversationArgs } as any);
const conversation = new ConversationModel({ ...conversationArgs });
const conversationMode = DisappearingMessages.changeToDisappearingConversationMode(
conversation
);
@ -310,7 +313,7 @@ describe('DisappearingMessage', () => {
});
// TODO legacy messages support will be removed in a future release
it('if the type is unknown and expireTimer > 0 then the conversation mode is legacy', async () => {
const conversation = new ConversationModel({ ...conversationArgs } as any);
const conversation = new ConversationModel({ ...conversationArgs });
const expirationType: DisappearingMessageType = 'unknown';
const expireTimer = 60; // seconds
const conversationMode = DisappearingMessages.changeToDisappearingConversationMode(
@ -322,7 +325,7 @@ describe('DisappearingMessage', () => {
expect(conversationMode, 'returns legacy').to.be.eq('legacy');
});
it('if the type is undefined and expireTimer > 0 then the conversation mode is legacy', async () => {
const conversation = new ConversationModel({ ...conversationArgs } as any);
const conversation = new ConversationModel({ ...conversationArgs });
const expireTimer = 60; // seconds
const conversationMode = DisappearingMessages.changeToDisappearingConversationMode(
conversation,
@ -339,7 +342,7 @@ describe('DisappearingMessage', () => {
const visibleMessage = generateVisibleMessage();
const convoToUpdate = new ConversationModel({
...conversationArgs,
} as any);
});
// TODO legacy messages support will be removed in a future release
Sinon.stub(ReleasedFeatures, 'checkIsDisappearMessageV2FeatureReleased').resolves(true);
@ -370,7 +373,7 @@ describe('DisappearingMessage', () => {
const convoToUpdate = new ConversationModel({
...conversationArgs,
} as any);
});
// TODO legacy messages support will be removed in a future release
Sinon.stub(ReleasedFeatures, 'checkIsDisappearMessageV2FeatureReleased').resolves(true);
@ -410,7 +413,7 @@ describe('DisappearingMessage', () => {
const convoToUpdate = new ConversationModel({
...conversationArgs,
} as any);
});
// TODO legacy messages support will be removed in a future release
Sinon.stub(ReleasedFeatures, 'checkIsDisappearMessageV2FeatureReleased').resolves(true);
@ -451,7 +454,7 @@ describe('DisappearingMessage', () => {
const convoToUpdate = new ConversationModel({
...conversationArgs,
lastDisappearingMessageChangeTimestamp,
} as any);
});
// TODO legacy messages support will be removed in a future release
Sinon.stub(ReleasedFeatures, 'checkIsDisappearMessageV2FeatureReleased').resolves(true);
@ -484,7 +487,7 @@ describe('DisappearingMessage', () => {
const conversation = new ConversationModel({
...conversationArgs,
id: ourNumber,
} as any);
});
const message = generateFakeOutgoingPrivateMessage(conversation.get('id'));
message.set({
expirationType: 'deleteAfterRead',
@ -508,7 +511,7 @@ describe('DisappearingMessage', () => {
const conversation = new ConversationModel({
...conversationArgs,
id: ourNumber,
} as any);
});
const message = generateFakeOutgoingPrivateMessage(conversation.get('id'));
message.set({
expirationType: 'deleteAfterRead',
@ -524,7 +527,7 @@ describe('DisappearingMessage', () => {
const conversation = new ConversationModel({
...conversationArgs,
id: ourNumber,
} as any);
});
const message = generateFakeOutgoingPrivateMessage(conversation.get('id'));
message.set({
expireTimer: 300,
@ -541,7 +544,7 @@ describe('DisappearingMessage', () => {
const conversation = new ConversationModel({
...conversationArgs,
id: ourNumber,
} as any);
});
const message = generateFakeOutgoingPrivateMessage(conversation.get('id'));
message.set({
expirationType: 'deleteAfterRead',
@ -569,7 +572,7 @@ describe('DisappearingMessage', () => {
it('if the coversation is public it should return false', async () => {
const conversation = new ConversationModel({
...conversationArgs,
} as any);
});
Sinon.stub(conversation, 'isPublic').returns(true);
const updateSuccess = await conversation.updateExpireTimer({
@ -586,7 +589,7 @@ describe('DisappearingMessage', () => {
const lastDisappearingMessageChangeTimestamp = GetNetworkTime.getNowWithNetworkOffset();
const conversation = new ConversationModel({
...conversationArgs,
} as any);
});
conversation.set({
expirationMode: 'deleteAfterRead',
expireTimer: 60,
@ -606,7 +609,7 @@ describe('DisappearingMessage', () => {
it('if we receive the same settings we ignore it', async () => {
const conversation = new ConversationModel({
...conversationArgs,
} as any);
});
conversation.set({
expirationMode: 'deleteAfterRead',
expireTimer: 60,
@ -626,7 +629,7 @@ describe('DisappearingMessage', () => {
const lastDisappearingMessageChangeTimestamp = GetNetworkTime.getNowWithNetworkOffset();
const conversation = new ConversationModel({
...conversationArgs,
} as any);
});
Sinon.stub(conversation, 'addSingleOutgoingMessage').resolves();
Sinon.stub(conversation, 'commit').resolves();
TestUtils.stubData('saveMessage').resolves();

33
ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
Unescape Escape View File

@ -4,6 +4,7 @@ import Sinon from 'sinon';
import { ConversationModel } from '../../../../models/conversation';
import {
CONVERSATION_PRIORITIES,
ConversationAttributes,
ConversationTypeEnum,
} from '../../../../models/conversationAttributes';
import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime';
@ -25,7 +26,7 @@ describe('libsession_contacts', () => {
isApproved: true,
active_at: 123,
didApproveMe: true,
};
} as ConversationAttributes;
beforeEach(() => {
Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset);
@ -41,7 +42,7 @@ describe('libsession_contacts', () => {
it('excludes ourselves', () => {
expect(
SessionUtilContact.isContactToStoreInWrapper(
new ConversationModel({ ...validArgs, id: ourNumber } as any)
new ConversationModel({ ...validArgs, id: ourNumber })
)
).to.be.eq(false);
});
@ -49,7 +50,7 @@ describe('libsession_contacts', () => {
it('excludes non private', () => {
expect(
SessionUtilContact.isContactToStoreInWrapper(
new ConversationModel({ ...validArgs, type: ConversationTypeEnum.GROUP } as any)
new ConversationModel({ ...validArgs, type: ConversationTypeEnum.GROUP })
)
).to.be.eq(false);
});
@ -57,7 +58,7 @@ describe('libsession_contacts', () => {
it('includes private', () => {
expect(
SessionUtilContact.isContactToStoreInWrapper(
new ConversationModel({ ...validArgs, type: ConversationTypeEnum.PRIVATE } as any)
new ConversationModel({ ...validArgs, type: ConversationTypeEnum.PRIVATE })
)
).to.be.eq(true);
});
@ -69,7 +70,7 @@ describe('libsession_contacts', () => {
...validArgs,
type: ConversationTypeEnum.PRIVATE,
priority: CONVERSATION_PRIORITIES.hidden,
} as any)
})
)
).to.be.eq(true);
});
@ -81,7 +82,7 @@ describe('libsession_contacts', () => {
...validArgs,
type: ConversationTypeEnum.PRIVATE,
id: '1511111111111',
} as any)
})
)
).to.be.eq(false);
});
@ -94,7 +95,7 @@ describe('libsession_contacts', () => {
type: ConversationTypeEnum.PRIVATE,
priority: CONVERSATION_PRIORITIES.hidden,
active_at: 0,
} as any)
})
)
).to.be.eq(false);
});
@ -119,7 +120,7 @@ describe('libsession_contacts', () => {
...validArgs,
didApproveMe: false,
isApproved: false,
} as any)
})
)
).to.be.eq(true);
});
@ -131,7 +132,7 @@ describe('libsession_contacts', () => {
...validArgs,
didApproveMe: false,
isApproved: true,
} as any)
})
)
).to.be.eq(true);
});
@ -157,7 +158,7 @@ describe('libsession_contacts', () => {
new ConversationModel({
...validArgs,
id: validIdWithSpaceInIt,
} as any)
})
)
).to.be.eq(false);
});
@ -170,7 +171,7 @@ describe('libsession_contacts', () => {
new ConversationModel({
...validArgs,
id: validIdWithSpaceInIt,
} as any)
})
)
).to.be.eq(false);
});
@ -183,7 +184,7 @@ describe('libsession_contacts', () => {
new ConversationModel({
...validArgs,
id: validIdWithSpaceInIt,
} as any)
})
)
).to.be.eq(false);
});
@ -196,7 +197,7 @@ describe('libsession_contacts', () => {
new ConversationModel({
...validArgs,
id: validIdWithSpaceInIt,
} as any)
})
)
).to.be.eq(false);
});
@ -208,7 +209,7 @@ describe('libsession_contacts', () => {
...validArgs,
didApproveMe: true,
isApproved: false,
} as any)
})
)
).to.be.eq(true);
});
@ -229,7 +230,7 @@ describe('libsession_contacts', () => {
const contact = new ConversationModel({
...validArgs,
...contactArgs,
} as any);
} as ConversationAttributes);
Sinon.stub(getConversationController(), 'get').returns(contact);
Sinon.stub(SessionUtilContact, 'isContactToStoreInWrapper').returns(true);
@ -283,7 +284,7 @@ describe('libsession_contacts', () => {
...contactArgs,
expirationMode: 'deleteAfterSend',
expireTimer: 300,
} as any);
});
Sinon.stub(getConversationController(), 'get').returns(contact);
Sinon.stub(SessionUtilContact, 'isContactToStoreInWrapper').returns(true);

23
ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts
Unescape Escape View File

@ -6,6 +6,7 @@ import Sinon from 'sinon';
import { ConversationModel } from '../../../../models/conversation';
import {
CONVERSATION_PRIORITIES,
ConversationAttributes,
ConversationTypeEnum,
} from '../../../../models/conversationAttributes';
import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime';
@ -25,7 +26,7 @@ describe('libsession_user_groups', () => {
const validArgs = {
type: ConversationTypeEnum.GROUP,
active_at: 1234,
};
} as ConversationAttributes;
beforeEach(() => {
Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset);
@ -45,7 +46,7 @@ describe('libsession_user_groups', () => {
it('includes public group/community', () => {
expect(
SessionUtilUserGroups.isUserGroupToStoreInWrapper(
new ConversationModel({ ...validArgs, ...communityArgs } as any)
new ConversationModel({ ...validArgs, ...communityArgs })
)
).to.be.eq(true);
});
@ -64,7 +65,7 @@ describe('libsession_user_groups', () => {
...validArgs,
type: ConversationTypeEnum.GROUP,
id: '05123456564',
} as any;
} as ConversationAttributes;
it('includes legacy group', () => {
expect(
@ -103,7 +104,7 @@ describe('libsession_user_groups', () => {
new ConversationModel({
...validLegacyGroupArgs,
active_at: undefined,
})
} as any)
)
).to.be.eq(false);
});
@ -127,7 +128,7 @@ describe('libsession_user_groups', () => {
...validArgs,
type: ConversationTypeEnum.GROUPV3,
id: '03123456564',
} as any)
})
)
).to.be.eq(false);
});
@ -138,7 +139,7 @@ describe('libsession_user_groups', () => {
new ConversationModel({
...validArgs,
id: '',
} as any)
})
)
).to.be.eq(false);
@ -147,7 +148,7 @@ describe('libsession_user_groups', () => {
new ConversationModel({
...validArgs,
id: '9871',
} as any)
})
)
).to.be.eq(false);
});
@ -159,7 +160,7 @@ describe('libsession_user_groups', () => {
...validArgs,
id: '0511111',
type: ConversationTypeEnum.PRIVATE,
} as any)
})
)
).to.be.eq(false);
});
@ -173,13 +174,13 @@ describe('libsession_user_groups', () => {
expirationMode: 'off',
expireTimer: 0,
members: [groupECKeyPair.publicKeyData.toString()],
};
} as ConversationAttributes;
it('returns wrapper values that match with the inputted group', async () => {
const group = new ConversationModel({
...validArgs,
...groupArgs,
} as any);
});
Sinon.stub(getConversationController(), 'get').returns(group);
Sinon.stub(SessionUtilUserGroups, 'isUserGroupToStoreInWrapper').returns(true);
TestUtils.stubData('getLatestClosedGroupEncryptionKeyPair').resolves(
@ -236,7 +237,7 @@ describe('libsession_user_groups', () => {
...groupArgs,
expirationMode: 'deleteAfterSend',
expireTimer: 300,
} as any);
});
Sinon.stub(getConversationController(), 'get').returns(group);
Sinon.stub(SessionUtilUserGroups, 'isUserGroupToStoreInWrapper').returns(true);
TestUtils.stubData('getLatestClosedGroupEncryptionKeyPair').resolves(

13
ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile_test.ts
Unescape Escape View File

@ -3,7 +3,10 @@ import { expect } from 'chai';
import Sinon from 'sinon';
import { ConversationModel } from '../../../../models/conversation';
import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
import {
ConversationAttributes,
ConversationTypeEnum,
} from '../../../../models/conversationAttributes';
import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime';
import { getConversationController } from '../../../../session/conversations';
import { UserUtils } from '../../../../session/utils';
@ -22,7 +25,7 @@ describe('libsession_user_profile', () => {
isApproved: true,
active_at: 123,
didApproveMe: true,
};
} as ConversationAttributes;
beforeEach(() => {
Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset);
@ -60,7 +63,7 @@ describe('libsession_user_profile', () => {
const contact = new ConversationModel({
...validArgs,
...contactArgs,
} as any);
} as ConversationAttributes);
Sinon.stub(getConversationController(), 'get').returns(contact);
Sinon.stub(SessionUtilUserProfile, 'isUserProfileToStoreInWrapper').returns(true);
@ -99,7 +102,7 @@ describe('libsession_user_profile', () => {
...validArgs,
...contactArgs,
id: TestUtils.generateFakePubKeyStr(),
} as any);
} as ConversationAttributes);
Sinon.stub(getConversationController(), 'get').returns(contact);
Sinon.stub(SessionUtilUserProfile, 'isUserProfileToStoreInWrapper').returns(true);
@ -116,7 +119,7 @@ describe('libsession_user_profile', () => {
expirationMode: 'deleteAfterSend',
expireTimer: 300,
id: ourNumber,
} as any);
});
Sinon.stub(getConversationController(), 'get').returns(contact);
Sinon.stub(SessionUtilUserProfile, 'isUserProfileToStoreInWrapper').returns(true);

Write Preview
Loading…
Cancel
Save