Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-05-04 15:15:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format all source code using Prettier

Browse Source
This commit is contained in:
Daniel Gasienica
2018-04-27 17:25:04 -04:00
parent b4dee3f30b
commit 1dd87ad197
149 changed files with 17847 additions and 15439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/modules/types/attachment_test.js
+16 -16
View File
@@ -3,7 +3,9 @@ require('mocha-testcheck').install();
const { assert } = require('chai');
const Attachment = require('../../../js/modules/types/attachment');
const { stringToArrayBuffer } = require('../../../js/modules/string_to_array_buffer');
const {
stringToArrayBuffer,
} = require('../../../js/modules/string_to_array_buffer');
describe('Attachment', () => {
describe('replaceUnicodeOrderOverrides', () => {
@@ -67,7 +69,7 @@ describe('Attachment', () => {
check.it(
'should ignore non-order-override characters',
gen.string.suchThat(hasNoUnicodeOrderOverrides),
(fileName) => {
fileName => {
const input = {
contentType: 'image/jpeg',
data: null,
@@ -120,15 +122,14 @@ describe('Attachment', () => {
};
const expectedAttachmentData = stringToArrayBuffer('Above us only sky');
const writeNewAttachmentData = async (attachmentData) => {
const writeNewAttachmentData = async attachmentData => {
assert.deepEqual(attachmentData, expectedAttachmentData);
return 'abc/abcdefgh123456789';
};
const actual = await Attachment.migrateDataToFileSystem(
input,
{ writeNewAttachmentData }
);
const actual = await Attachment.migrateDataToFileSystem(input, {
writeNewAttachmentData,
});
assert.deepEqual(actual, expected);
});
@@ -145,13 +146,11 @@ describe('Attachment', () => {
size: 1111,
};
const writeNewAttachmentData = async () =>
'abc/abcdefgh123456789';
const writeNewAttachmentData = async () => 'abc/abcdefgh123456789';
const actual = await Attachment.migrateDataToFileSystem(
input,
{ writeNewAttachmentData }
);
const actual = await Attachment.migrateDataToFileSystem(input, {
writeNewAttachmentData,
});
assert.deepEqual(actual, expected);
});
@@ -163,11 +162,12 @@ describe('Attachment', () => {
size: 1111,
};
const writeNewAttachmentData = async () =>
'abc/abcdefgh123456789';
const writeNewAttachmentData = async () => 'abc/abcdefgh123456789';
try {
await Attachment.migrateDataToFileSystem(input, { writeNewAttachmentData });
await Attachment.migrateDataToFileSystem(input, {
writeNewAttachmentData,
});
} catch (error) {
assert.strictEqual(
error.message,
test/modules/types/errors_test.js
+6 -8
View File
@@ -4,7 +4,6 @@ const { assert } = require('chai');
const Errors = require('../../../js/modules/types/errors');
const APP_ROOT_PATH = Path.join(__dirname, '..', '..', '..');
describe('Errors', () => {
@@ -15,7 +14,11 @@ describe('Errors', () => {
const formattedError = Errors.toLogFormat(error);
assert.include(formattedError, 'errors_test.js');
assert.include(formattedError, APP_ROOT_PATH, 'Formatted stack has app path');
assert.include(
formattedError,
APP_ROOT_PATH,
'Formatted stack has app path'
);
});
it('should return error string representation if stack is missing', () => {
@@ -28,12 +31,7 @@ describe('Errors', () => {
assert.strictEqual(formattedError, 'Error: boom');
});
[
0,
false,
null,
undefined,
].forEach((value) => {
[0, false, null, undefined].forEach(value => {
it(`should return \`${value}\` argument`, () => {
const formattedNonError = Errors.toLogFormat(value);
assert.strictEqual(formattedNonError, value);
test/modules/types/message_test.js
+155 -100
View File
@@ -2,8 +2,9 @@ const { assert } = require('chai');
const sinon = require('sinon');
const Message = require('../../../js/modules/types/message');
const { stringToArrayBuffer } = require('../../../js/modules/string_to_array_buffer');
const {
stringToArrayBuffer,
} = require('../../../js/modules/string_to_array_buffer');
describe('Message', () => {
describe('createAttachmentDataWriter', () => {
@@ -18,8 +19,9 @@ describe('Message', () => {
};
const writeExistingAttachmentData = () => {};
const actual =
await Message.createAttachmentDataWriter(writeExistingAttachmentData)(input);
const actual = await Message.createAttachmentDataWriter(
writeExistingAttachmentData
)(input);
assert.deepEqual(actual, expected);
});
@@ -36,8 +38,9 @@ describe('Message', () => {
};
const writeExistingAttachmentData = () => {};
const actual =
await Message.createAttachmentDataWriter(writeExistingAttachmentData)(input);
const actual = await Message.createAttachmentDataWriter(
writeExistingAttachmentData
)(input);
assert.deepEqual(actual, expected);
});
@@ -45,26 +48,34 @@ describe('Message', () => {
const input = {
body: 'Imagine there is no heaven…',
schemaVersion: 4,
attachments: [{
path: 'ab/abcdefghi',
data: stringToArrayBuffer('It’s easy if you try'),
}],
attachments: [
{
path: 'ab/abcdefghi',
data: stringToArrayBuffer('It’s easy if you try'),
},
],
};
const expected = {
body: 'Imagine there is no heaven…',
schemaVersion: 4,
attachments: [{
path: 'ab/abcdefghi',
}],
attachments: [
{
path: 'ab/abcdefghi',
},
],
};
const writeExistingAttachmentData = (attachment) => {
const writeExistingAttachmentData = attachment => {
assert.equal(attachment.path, 'ab/abcdefghi');
assert.deepEqual(attachment.data, stringToArrayBuffer('It’s easy if you try'));
assert.deepEqual(
attachment.data,
stringToArrayBuffer('It’s easy if you try')
);
};
const actual =
await Message.createAttachmentDataWriter(writeExistingAttachmentData)(input);
const actual = await Message.createAttachmentDataWriter(
writeExistingAttachmentData
)(input);
assert.deepEqual(actual, expected);
});
@@ -74,12 +85,14 @@ describe('Message', () => {
schemaVersion: 4,
attachments: [],
quote: {
attachments: [{
thumbnail: {
path: 'ab/abcdefghi',
data: stringToArrayBuffer('It’s easy if you try'),
attachments: [
{
thumbnail: {
path: 'ab/abcdefghi',
data: stringToArrayBuffer('It’s easy if you try'),
},
},
}],
],
},
};
const expected = {
@@ -87,21 +100,27 @@ describe('Message', () => {
schemaVersion: 4,
attachments: [],
quote: {
attachments: [{
thumbnail: {
path: 'ab/abcdefghi',
attachments: [
{
thumbnail: {
path: 'ab/abcdefghi',
},
},
}],
],
},
};
const writeExistingAttachmentData = (attachment) => {
const writeExistingAttachmentData = attachment => {
assert.equal(attachment.path, 'ab/abcdefghi');
assert.deepEqual(attachment.data, stringToArrayBuffer('It’s easy if you try'));
assert.deepEqual(
attachment.data,
stringToArrayBuffer('It’s easy if you try')
);
};
const actual =
await Message.createAttachmentDataWriter(writeExistingAttachmentData)(input);
const actual = await Message.createAttachmentDataWriter(
writeExistingAttachmentData
)(input);
assert.deepEqual(actual, expected);
});
});
@@ -142,18 +161,22 @@ describe('Message', () => {
it('should inherit existing attachment schema version', () => {
const input = {
body: 'Imagine there is no heaven…',
attachments: [{
contentType: 'image/jpeg',
fileName: 'lennon.jpg',
schemaVersion: 7,
}],
attachments: [
{
contentType: 'image/jpeg',
fileName: 'lennon.jpg',
schemaVersion: 7,
},
],
};
const expected = {
body: 'Imagine there is no heaven…',
attachments: [{
contentType: 'image/jpeg',
fileName: 'lennon.jpg',
}],
attachments: [
{
contentType: 'image/jpeg',
fileName: 'lennon.jpg',
},
],
schemaVersion: 7,
};
@@ -166,30 +189,36 @@ describe('Message', () => {
describe('upgradeSchema', () => {
it('should upgrade an unversioned message to the latest version', async () => {
const input = {
attachments: [{
contentType: 'application/json',
data: stringToArrayBuffer('It’s easy if you try'),
fileName: 'test\u202Dfig.exe',
size: 1111,
}],
attachments: [
{
contentType: 'application/json',
data: stringToArrayBuffer('It’s easy if you try'),
fileName: 'test\u202Dfig.exe',
size: 1111,
},
],
schemaVersion: 0,
};
const expected = {
attachments: [{
contentType: 'application/json',
path: 'abc/abcdefg',
fileName: 'test\uFFFDfig.exe',
size: 1111,
}],
attachments: [
{
contentType: 'application/json',
path: 'abc/abcdefg',
fileName: 'test\uFFFDfig.exe',
size: 1111,
},
],
hasAttachments: 1,
hasVisualMediaAttachments: undefined,
hasFileAttachments: 1,
schemaVersion: Message.CURRENT_SCHEMA_VERSION,
};
const expectedAttachmentData = stringToArrayBuffer('It’s easy if you try');
const expectedAttachmentData = stringToArrayBuffer(
'It’s easy if you try'
);
const context = {
writeNewAttachmentData: async (attachmentData) => {
writeNewAttachmentData: async attachmentData => {
assert.deepEqual(attachmentData, expectedAttachmentData);
return 'abc/abcdefg';
},
@@ -201,21 +230,25 @@ describe('Message', () => {
context('with multiple upgrade steps', () => {
it('should return last valid message when any upgrade step fails', async () => {
const input = {
attachments: [{
contentType: 'application/json',
data: null,
fileName: 'test\u202Dfig.exe',
size: 1111,
}],
attachments: [
{
contentType: 'application/json',
data: null,
fileName: 'test\u202Dfig.exe',
size: 1111,
},
],
schemaVersion: 0,
};
const expected = {
attachments: [{
contentType: 'application/json',
data: null,
fileName: 'test\u202Dfig.exe',
size: 1111,
}],
attachments: [
{
contentType: 'application/json',
data: null,
fileName: 'test\u202Dfig.exe',
size: 1111,
},
],
hasUpgradedToVersion1: true,
schemaVersion: 1,
};
@@ -241,21 +274,25 @@ describe('Message', () => {
it('should skip out-of-order upgrade steps', async () => {
const input = {
attachments: [{
contentType: 'application/json',
data: null,
fileName: 'test\u202Dfig.exe',
size: 1111,
}],
attachments: [
{
contentType: 'application/json',
data: null,
fileName: 'test\u202Dfig.exe',
size: 1111,
},
],
schemaVersion: 0,
};
const expected = {
attachments: [{
contentType: 'application/json',
data: null,
fileName: 'test\u202Dfig.exe',
size: 1111,
}],
attachments: [
{
contentType: 'application/json',
data: null,
fileName: 'test\u202Dfig.exe',
size: 1111,
},
],
schemaVersion: 2,
hasUpgradedToVersion1: true,
hasUpgradedToVersion2: true,
@@ -352,7 +389,9 @@ describe('Message', () => {
describe('_mapQuotedAttachments', () => {
it('handles message with no quote', async () => {
const upgradeAttachment = sinon.stub().throws(new Error("Shouldn't be called"));
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Message._mapQuotedAttachments(upgradeAttachment);
const message = {
@@ -363,7 +402,9 @@ describe('Message', () => {
});
it('handles quote with no attachments', async () => {
const upgradeAttachment = sinon.stub().throws(new Error("Shouldn't be called"));
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Message._mapQuotedAttachments(upgradeAttachment);
const message = {
@@ -384,7 +425,9 @@ describe('Message', () => {
});
it('handles zero attachments', async () => {
const upgradeAttachment = sinon.stub().throws(new Error("Shouldn't be called"));
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Message._mapQuotedAttachments(upgradeAttachment);
const message = {
@@ -399,7 +442,9 @@ describe('Message', () => {
});
it('handles attachments with no thumbnail', async () => {
const upgradeAttachment = sinon.stub().throws(new Error("Shouldn't be called"));
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Message._mapQuotedAttachments(upgradeAttachment);
const message = {
@@ -414,30 +459,36 @@ describe('Message', () => {
});
it('eliminates thumbnails with no data fielkd', async () => {
const upgradeAttachment = sinon.stub().throws(new Error("Shouldn't be called"));
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Message._mapQuotedAttachments(upgradeAttachment);
const message = {
body: 'hey there!',
quote: {
text: 'hey!',
attachments: [{
fileName: 'cat.gif',
contentType: 'image/gif',
thumbnail: {
fileName: 'failed to download!',
attachments: [
{
fileName: 'cat.gif',
contentType: 'image/gif',
thumbnail: {
fileName: 'failed to download!',
},
},
}],
],
},
};
const expected = {
body: 'hey there!',
quote: {
text: 'hey!',
attachments: [{
contentType: 'image/gif',
fileName: 'cat.gif',
}],
attachments: [
{
contentType: 'image/gif',
fileName: 'cat.gif',
},
],
},
};
const result = await upgradeVersion(message);
@@ -454,22 +505,26 @@ describe('Message', () => {
body: 'hey there!',
quote: {
text: 'hey!',
attachments: [{
thumbnail: {
data: 'data is here',
attachments: [
{
thumbnail: {
data: 'data is here',
},
},
}],
],
},
};
const expected = {
body: 'hey there!',
quote: {
text: 'hey!',
attachments: [{
thumbnail: {
path: '/new/path/on/disk',
attachments: [
{
thumbnail: {
path: '/new/path/on/disk',
},
},
}],
],
},
};
const result = await upgradeVersion(message);
test/modules/types/mime_test.js
+4 -6
View File
@@ -2,7 +2,6 @@ const { assert } = require('chai');
const MIME = require('../../../ts/types/MIME');
describe('MIME', () => {
describe('isJPEG', () => {
it('should return true for `image/jpeg`', () => {
@@ -20,11 +19,10 @@ describe('MIME', () => {
false,
null,
undefined,
]
.forEach((value) => {
it(`should return false for \`${value}\``, () => {
assert.isFalse(MIME.isJPEG(value));
});
].forEach(value => {
it(`should return false for \`${value}\``, () => {
assert.isFalse(MIME.isJPEG(value));
});
});
});
});
test/modules/types/schema_version_test.js
+4 -9
View File
@@ -3,21 +3,16 @@ const { assert } = require('chai');
const SchemaVersion = require('../../../js/modules/types/schema_version');
describe('SchemaVersion', () => {
describe('isValid', () => {
check.it(
'should return true for positive integers',
gen.posInt,
(input) => {
assert.isTrue(SchemaVersion.isValid(input));
}
);
check.it('should return true for positive integers', gen.posInt, input => {
assert.isTrue(SchemaVersion.isValid(input));
});
check.it(
'should return false for any other value',
gen.primitive.suchThat(value => typeof value !== 'number' || value < 0),
(input) => {
input => {
assert.isFalse(SchemaVersion.isValid(input));
}
);
test/modules/types/settings_test.js
-1
View File
@@ -3,7 +3,6 @@ const { assert } = require('chai');
const Settings = require('../../../js/modules/types/settings');
describe('Settings', () => {
const sandbox = sinon.createSandbox();