From 544995cc21c2e5d03c970a3dc46d1390fd43e55f Mon Sep 17 00:00:00 2001 From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com> Date: Mon, 19 Oct 2020 14:16:27 -0500 Subject: [PATCH] Clean up tests --- ts/test/components/LeftPane_test.tsx | 232 ++++----------------------- 1 file changed, 33 insertions(+), 199 deletions(-) diff --git a/ts/test/components/LeftPane_test.tsx b/ts/test/components/LeftPane_test.tsx index 0372180a9..c6ff54982 100644 --- a/ts/test/components/LeftPane_test.tsx +++ b/ts/test/components/LeftPane_test.tsx @@ -1,122 +1,34 @@ -import { expect } from 'chai'; +import React from 'react'; +import { assert } from 'chai'; -import { - LeftPane, - RowType, - PropsType, - HeaderType, -} from '../../components/LeftPane'; +import { LeftPane, RowType, HeaderType } from '../../components/LeftPane'; import { setup as setupI18n } from '../../../js/modules/i18n'; import enMessages from '../../../_locales/en/messages.json'; const i18n = setupI18n('en', enMessages); describe('LeftPane', () => { - /* eslint-disable @typescript-eslint/no-explicit-any */ const defaultProps = { archivedConversations: [], conversations: [], i18n, openConversationInternal: () => null, pinnedConversations: [], - renderExpiredBuildDialog: () => '
' as any, - renderMainHeader: () => '
' as any, - renderMessageSearchResult: () => '
' as any, - renderNetworkStatus: () => '
' as any, - renderRelinkDialog: () => '
' as any, - renderUpdateDialog: () => '
' as any, + renderExpiredBuildDialog: () =>
, + renderMainHeader: () =>
, + renderMessageSearchResult: () =>
, + renderNetworkStatus: () =>
, + renderRelinkDialog: () =>
, + renderUpdateDialog: () =>
, showArchivedConversations: () => null, showInbox: () => null, startNewConversation: () => null, }; - /* eslint-enable @typescript-eslint/no-explicit-any */ describe('getRowFromIndex', () => { - let leftPane: LeftPane; - - describe('with pinned, non-pinned, and archived chats', () => { - it('returns headers, conversations, and an archived button', () => { - leftPane = new LeftPane({ - ...defaultProps, - pinnedConversations: [ - { - id: 'philly-convo', - isPinned: true, - isSelected: false, - lastUpdated: Date.now(), - title: 'Philip Glass', - type: 'direct', - }, - { - id: 'robbo-convo', - isPinned: true, - isSelected: false, - lastUpdated: Date.now(), - title: 'Robert Moog', - type: 'direct', - }, - ], - conversations: [ - { - id: 'etta-convo', - isSelected: false, - lastUpdated: Date.now(), - title: 'Etta James', - type: 'direct', - }, - { - id: 'kimbra-convo', - isPinned: false, - isSelected: false, - lastUpdated: Date.now(), - title: 'Kimbra', - type: 'direct', - }, - ], - archivedConversations: [ - { - id: 'jerry-convo', - isSelected: false, - lastUpdated: Date.now(), - title: 'Jerry Jordan', - type: 'direct', - }, - ], - }); - - expect(leftPane.getRowFromIndex(0)).to.eql({ - headerType: HeaderType.Pinned, - type: RowType.Header, - }); - expect(leftPane.getRowFromIndex(1)).to.eql({ - index: 0, - type: RowType.PinnedConversation, - }); - expect(leftPane.getRowFromIndex(2)).to.eql({ - index: 1, - type: RowType.PinnedConversation, - }); - expect(leftPane.getRowFromIndex(3)).to.eql({ - headerType: HeaderType.Chats, - type: RowType.Header, - }); - expect(leftPane.getRowFromIndex(4)).to.eql({ - index: 0, - type: RowType.Conversation, - }); - expect(leftPane.getRowFromIndex(5)).to.eql({ - index: 1, - type: RowType.Conversation, - }); - expect(leftPane.getRowFromIndex(6)).to.eql({ - type: RowType.ArchiveButton, - }); - }); - }); - describe('given only pinned chats', () => { - beforeEach(function beforeEach() { - const props: PropsType = { + it('returns pinned chats, not headers', () => { + const leftPane = new LeftPane({ ...defaultProps, pinnedConversations: [ { @@ -136,17 +48,13 @@ describe('LeftPane', () => { type: 'direct', }, ], - }; - leftPane = new LeftPane(props); - }); + }); - it('return pinned chats, not headers', () => { - expect(leftPane.getRowFromIndex(0)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(0), { index: 0, type: RowType.PinnedConversation, }); - - expect(leftPane.getRowFromIndex(1)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(1), { index: 1, type: RowType.PinnedConversation, }); @@ -155,7 +63,7 @@ describe('LeftPane', () => { describe('given only non-pinned chats', () => { it('returns conversations, not headers', () => { - const props: PropsType = { + const leftPane = new LeftPane({ ...defaultProps, conversations: [ { @@ -174,15 +82,13 @@ describe('LeftPane', () => { type: 'direct', }, ], - }; - leftPane = new LeftPane(props); + }); - expect(leftPane.getRowFromIndex(0)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(0), { index: 0, type: RowType.Conversation, }); - - expect(leftPane.getRowFromIndex(1)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(1), { index: 1, type: RowType.Conversation, }); @@ -190,8 +96,8 @@ describe('LeftPane', () => { }); describe('given only pinned and non-pinned chats', () => { - beforeEach(function beforeEach() { - const props: PropsType = { + it('returns headers and conversations', () => { + const leftPane = new LeftPane({ ...defaultProps, conversations: [ { @@ -212,94 +118,30 @@ describe('LeftPane', () => { type: 'direct', }, ], - }; - leftPane = new LeftPane(props); - }); + }); - it('returns headers and conversations', () => { - expect(leftPane.getRowFromIndex(0)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(0), { headerType: HeaderType.Pinned, type: RowType.Header, }); - - expect(leftPane.getRowFromIndex(1)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(1), { index: 0, type: RowType.PinnedConversation, }); - - expect(leftPane.getRowFromIndex(2)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(2), { headerType: HeaderType.Chats, type: RowType.Header, }); - - expect(leftPane.getRowFromIndex(3)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(3), { index: 0, type: RowType.Conversation, }); }); }); - describe('given only pinned and archived chats', () => { - it('shows the pinned chats with no headers', () => { - leftPane = new LeftPane({ - ...defaultProps, - pinnedConversations: [ - { - id: 'philly-convo', - isPinned: true, - isSelected: false, - lastUpdated: Date.now(), - title: 'Philip Glass', - type: 'direct', - }, - ], - archivedConversations: [ - { - id: 'fred-convo', - isSelected: false, - lastUpdated: Date.now(), - title: 'Fred Willard', - type: 'direct', - }, - ], - }); - - expect(leftPane.getRowFromIndex(0)).to.eql({ - index: 0, - type: RowType.PinnedConversation, - }); - - expect(leftPane.getRowFromIndex(1)).to.eql({ - type: RowType.ArchiveButton, - }); - }); - }); - - describe("given only archived conversations, which we're not showing", () => { - it('returns a single row, the archive button', () => { - leftPane = new LeftPane({ - ...defaultProps, - archivedConversations: [ - { - id: 'jerry-convo', - isSelected: false, - lastUpdated: Date.now(), - title: 'Jerry Jordan', - type: 'direct', - }, - ], - showArchived: false, - }); - - expect(leftPane.getRowFromIndex(0)).to.eql({ - type: RowType.ArchiveButton, - }); - }); - }); - describe('given not showing archive with archived conversation', () => { - beforeEach(function beforeEach() { - const props: PropsType = { + it('returns an archive button last', () => { + const leftPane = new LeftPane({ ...defaultProps, archivedConversations: [ { @@ -320,21 +162,17 @@ describe('LeftPane', () => { }, ], showArchived: false, - }; + }); - leftPane = new LeftPane(props); - }); - - it('returns an archive button last', () => { - expect(leftPane.getRowFromIndex(1)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(1), { type: RowType.ArchiveButton, }); }); }); describe('given showing archive and archive chats', () => { - beforeEach(function beforeEach() { - const props: PropsType = { + it('returns archived conversations', () => { + const leftPane = new LeftPane({ ...defaultProps, archivedConversations: [ { @@ -346,13 +184,9 @@ describe('LeftPane', () => { }, ], showArchived: true, - }; + }); - leftPane = new LeftPane(props); - }); - - it('returns archived conversations', () => { - expect(leftPane.getRowFromIndex(0)).to.eql({ + assert.deepEqual(leftPane.getRowFromIndex(0), { index: 0, type: RowType.ArchivedConversation, });