fix integration-tests

pull/1137/head
Audric Ackermann 5 years ago
parent fb4dd41a9a
commit 255616ff8f
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -48,10 +48,13 @@ describe('Message Syncing', function() {
// * Alice as a friend // * Alice as a friend
// * one open group with Alice // * one open group with Alice
// Linking Alice2 to Alice1
// alice2 should trigger auto FR with bob1 as it's one of her friend
// and alice2 should trigger a SESSION_REQUEST with bob1 as he is in a closed group with her
await common.linkApp2ToApp(Alice1, Alice2, common.TEST_PUBKEY1); await common.linkApp2ToApp(Alice1, Alice2, common.TEST_PUBKEY1);
await common.timeout(12000); await common.timeout(25000);
// validate primary pubkey of app2 is the same that in app1 // validate pubkey of app2 is the set
const alice2Pubkey = await Alice2.webContents.executeJavaScript( const alice2Pubkey = await Alice2.webContents.executeJavaScript(
'window.textsecure.storage.user.getNumber()' 'window.textsecure.storage.user.getNumber()'
); );
@ -95,7 +98,7 @@ describe('Message Syncing', function() {
); );
await common.logsContains( await common.logsContains(
alice2Logs, alice2Logs,
`Sending auto-friend-request:onlineBroadcast message to ${ `Sending auto-friend-request:friend-request message to ${
common.TEST_PUBKEY2 common.TEST_PUBKEY2
}`, }`,
1 1
@ -134,13 +137,6 @@ describe('Message Syncing', function() {
1 1
); );
// be sure only one autoFR accept was sent (even if multi device, we need to reply to that specific device only) // be sure only one autoFR accept was sent (even if multi device, we need to reply to that specific device only)
// FIXME happens 2 times await common.logsContains(bob1Logs, `Sending auto-friend-accept:onlineBroadcast message to`, 1); await common.logsContains(bob1Logs, `Sending auto-friend-accept:onlineBroadcast message to`, 1);
await common.logsContains(
bob1Logs,
`Sending session-request-accepted:onlineBroadcast message to ${alice2Pubkey}`,
1
);
// be sure only one session request accept was sent (even if multi device, we need to reply to that specific device only)
// FIXME happens 2 times await common.logsContains(bob1Logs, `Sending session-request-accepted:onlineBroadcast message to`, 1);
}); });
}); });

@ -2082,6 +2082,7 @@
return false; return false;
}, },
async handleSessionRequest(source, confirm) { async handleSessionRequest(source, confirm) {
window.console.log(`Received SESSION_REQUEST from source: ${source}`)
window.libloki.api.sendSessionEstablishedMessage(source); window.libloki.api.sendSessionEstablishedMessage(source);
confirm(); confirm();
}, },

Loading…
Cancel
Save