From 0837ff522382e10dcfefc00caf6182adb7dec912 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 18 Sep 2020 13:48:46 +1000 Subject: [PATCH] fix tests --- js/models/conversations.js | 2 +- test/models/conversations_test.js | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index d340ce79f..b2ec3bf66 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -2524,7 +2524,7 @@ getAvatar() { const url = this.getAvatarPath(); - return url ? { url } : { url: null }; + return { url: url || null }; }, getNotificationIcon() { diff --git a/test/models/conversations_test.js b/test/models/conversations_test.js index 226e80365..4e9c741d6 100644 --- a/test/models/conversations_test.js +++ b/test/models/conversations_test.js @@ -129,12 +129,6 @@ describe('Conversation', () => { assert.equal(convo.getNumber(), ''); }); - it('has an avatar', () => { - const convo = new Whisper.ConversationCollection().add(attributes); - const avatar = convo.getAvatar(); - assert.property(avatar, 'content'); - }); - describe('when set to private', () => { it('correctly validates hex numbers', () => { const regularId = new Whisper.Conversation({