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

Apply new ESLint rules to legacy code

Browse source
This commit is contained in:
Chris Svenningsen 2020-09-08 17:46:29 -07:00 • committed by Scott Nonnenberg
parent 91cf075697
commit 8a2c17f65f
70 changed files with 376 additions and 516 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/backup_test.js
View file

@ -363,21 +363,24 @@ describe('Backup', () => {
return attachment;
}
return Object.assign({}, attachment, {
return {
...attachment,
thumbnail: await mapper(attachment.thumbnail, context),
});
};
};
const quotedAttachments =
(message.quote && message.quote.attachments) || [];
return Object.assign({}, message, {
quote: Object.assign({}, message.quote, {
return {
...message,
quote: {
...message.quote,
attachments: await Promise.all(
quotedAttachments.map(wrappedMapper)
),
}),
});
},
};
};
}
@ -391,17 +394,20 @@ describe('Backup', () => {
return wrappedLoadAttachment(thumbnail);
});
return Object.assign({}, await loadThumbnails(message), {
return {
...(await loadThumbnails(message)),
contact: await Promise.all(
(message.contact || []).map(async contact => {
return contact && contact.avatar && contact.avatar.avatar
? Object.assign({}, contact, {
avatar: Object.assign({}, contact.avatar, {
? {
...contact,
avatar: {
...contact.avatar,
avatar: await wrappedLoadAttachment(
contact.avatar.avatar
),
}),
})
},
}
: contact;
})
),
@ -429,7 +435,7 @@ describe('Backup', () => {
return item;
})
),
});
};
}
let backupDir;

33
test/modules/types/message_test.js
View file

@ -341,13 +341,17 @@ describe('Message', () => {
schemaVersion: 1,
};
const v1 = async message =>
Object.assign({}, message, { hasUpgradedToVersion1: true });
const v1 = async message => ({
...message,
hasUpgradedToVersion1: true,
});
const v2 = async () => {
throw new Error('boom');
};
const v3 = async message =>
Object.assign({}, message, { hasUpgradedToVersion3: true });
const v3 = async message => ({
...message,
hasUpgradedToVersion3: true,
});
const toVersion1 = Message._withSchemaVersion({
schemaVersion: 1,
@ -399,12 +403,18 @@ describe('Message', () => {
hasUpgradedToVersion2: true,
};
const v1 = async attachment =>
Object.assign({}, attachment, { hasUpgradedToVersion1: true });
const v2 = async attachment =>
Object.assign({}, attachment, { hasUpgradedToVersion2: true });
const v3 = async attachment =>
Object.assign({}, attachment, { hasUpgradedToVersion3: true });
const v1 = async attachment => ({
...attachment,
hasUpgradedToVersion1: true,
});
const v2 = async attachment => ({
...attachment,
hasUpgradedToVersion2: true,
});
const v3 = async attachment => ({
...attachment,
hasUpgradedToVersion3: true,
});
const toVersion1 = Message._withSchemaVersion({
schemaVersion: 1,
@ -451,8 +461,7 @@ describe('Message', () => {
});
it('should skip upgrading if message has already been upgraded', async () => {
const upgrade = async message =>
Object.assign({}, message, { foo: true });
const upgrade = async message => ({ ...message, foo: true });
const upgradeWithVersion = Message._withSchemaVersion({
schemaVersion: 3,
upgrade,