mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions 1

Remove accepted message without explicit user action

Browse source
This commit is contained in:
Jamie Kyle 2024-03-15 12:11:48 -07:00 • committed by GitHub
parent 8a21f8655f
commit 11ea595457
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 28 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ts/test-mock/pnp/merge_test.ts
View file

@ -149,7 +149,7 @@ describe('pnp/merge', function (this: Mocha.Suite) {
assert.strictEqual(await messages.count(), 0, 'message count');
await expectSystemMessages(window, [
'You accepted the message request',
// none
]);
}
@ -210,21 +210,16 @@ describe('pnp/merge', function (this: Mocha.Suite) {
if (withPNIMessage) {
if (pniSignatureVerified) {
await expectSystemMessages(window, [
'You accepted the message request',
'You accepted the message request',
/Your message history with ACI Contact and their number .* has been merged\./,
]);
} else {
await expectSystemMessages(window, [
'You accepted the message request',
'You accepted the message request',
/Your message history with ACI Contact and their number .* has been merged\./,
]);
}
} else {
await expectSystemMessages(window, [
'You accepted the message request',
'You accepted the message request',
// none
]);
}
}