Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'Contact' from 'Contact.*' properties, clean->parse

Browse Source
This commit is contained in:
Scott Nonnenberg
2018-05-08 13:12:11 -07:00
parent cda326ca45
commit 26be658892
3 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/modules/types/contact_test.js
View File

@@ -9,14 +9,12 @@ const {
describe('Contact', () => {
const NUMBER = '+12025550099';
describe('parseAndWriteContactAvatar', () => {
describe('parseAndWriteAvatar', () => {
it('handles message with no avatar in contact', async () => {
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Contact.parseAndWriteContactAvatar(
upgradeAttachment
);
const upgradeVersion = Contact.parseAndWriteAvatar(upgradeAttachment);
const message = {
body: 'hey there!',
@@ -42,9 +40,7 @@ describe('Contact', () => {
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Contact.parseAndWriteContactAvatar(
upgradeAttachment
);
const upgradeVersion = Contact.parseAndWriteAvatar(upgradeAttachment);
const message = {
body: 'hey there!',
@@ -86,9 +82,7 @@ describe('Contact', () => {
path: 'abc/abcdefg',
};
};
const upgradeVersion = Contact.parseAndWriteContactAvatar(
upgradeAttachment
);
const upgradeVersion = Contact.parseAndWriteAvatar(upgradeAttachment);
const message = {
body: 'hey there!',
@@ -164,9 +158,7 @@ describe('Contact', () => {
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Contact.parseAndWriteContactAvatar(
upgradeAttachment
);
const upgradeVersion = Contact.parseAndWriteAvatar(upgradeAttachment);
const message = {
body: 'hey there!',
@@ -207,9 +199,7 @@ describe('Contact', () => {
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Contact.parseAndWriteContactAvatar(
upgradeAttachment
);
const upgradeVersion = Contact.parseAndWriteAvatar(upgradeAttachment);
const message = {
body: 'hey there!',
@@ -250,9 +240,7 @@ describe('Contact', () => {
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Contact.parseAndWriteContactAvatar(
upgradeAttachment
);
const upgradeVersion = Contact.parseAndWriteAvatar(upgradeAttachment);
const message = {
body: 'hey there!',
@@ -290,9 +278,7 @@ describe('Contact', () => {
const upgradeAttachment = sinon
.stub()
.throws(new Error("Shouldn't be called"));
const upgradeVersion = Contact.parseAndWriteContactAvatar(
upgradeAttachment
);
const upgradeVersion = Contact.parseAndWriteAvatar(upgradeAttachment);
const message = {
contact: [
@@ -312,7 +298,7 @@ describe('Contact', () => {
});
});
describe('_validateContact', () => {
describe('_validate', () => {
it('returns error if contact has no name.displayName or organization', () => {
const messageId = 'the-message-id';
const contact = {
@@ -329,7 +315,7 @@ describe('Contact', () => {
const expected =
"Message the-message-id: Contact had neither 'displayName' nor 'organization'";
const result = Contact._validateContact(contact, { messageId });
const result = Contact._validate(contact, { messageId });
assert.deepEqual(result.message, expected);
});
@@ -345,7 +331,7 @@ describe('Contact', () => {
const expected =
'Message the-message-id: Contact had no included numbers, email or addresses';
const result = Contact._validateContact(contact, { messageId });
const result = Contact._validate(contact, { messageId });
assert.deepEqual(result.message, expected);
});
});