From 30d1ac1eeabdbe062d6f89798ff0dcd9c424cfc3 Mon Sep 17 00:00:00 2001 From: Kerry Date: Tue, 8 Feb 2022 13:14:52 +0100 Subject: [PATCH] unit test basic paths in UserInfo (#7740) * unit test main paths in UserInfo component Signed-off-by: Kerry Archibald * one more test case Signed-off-by: Kerry Archibald * remove BasicUserInfo export Signed-off-by: Kerry Archibald --- src/components/views/right_panel/BaseCard.tsx | 1 + .../views/right_panel/EncryptionInfo.tsx | 2 +- .../views/right_panel/EncryptionPanel.tsx | 2 + src/components/views/right_panel/UserInfo.tsx | 7 +- .../views/right_panel/UserInfo-test.tsx | 182 ++++++++++++++++++ 5 files changed, 190 insertions(+), 4 deletions(-) create mode 100644 test/components/views/right_panel/UserInfo-test.tsx diff --git a/src/components/views/right_panel/BaseCard.tsx b/src/components/views/right_panel/BaseCard.tsx index 8226b42072..0ecf0e5e6b 100644 --- a/src/components/views/right_panel/BaseCard.tsx +++ b/src/components/views/right_panel/BaseCard.tsx @@ -69,6 +69,7 @@ const BaseCard: React.FC = ({ let closeButton; if (onClose) { closeButton = = ({ } return -
+

{ _t("Encryption") }

{ description }
diff --git a/src/components/views/right_panel/EncryptionPanel.tsx b/src/components/views/right_panel/EncryptionPanel.tsx index a5e34ad94e..808ae12f25 100644 --- a/src/components/views/right_panel/EncryptionPanel.tsx +++ b/src/components/views/right_panel/EncryptionPanel.tsx @@ -106,6 +106,7 @@ const EncryptionPanel: React.FC = (props: IProps) => { setPhase(request.phase); } }, [onClose, request]); + useEventEmitter(request, "change", changeHandler); const onStartVerification = useCallback(async () => { @@ -131,6 +132,7 @@ const EncryptionPanel: React.FC = (props: IProps) => { const isSelfVerification = request ? request.isSelfVerification : member.userId === MatrixClientPeg.get().getUserId(); + if (!request || requested) { const initiatedByMe = (!request && isRequesting) || (request && request.initiatedByMe); return ( diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx index 86c5928721..476ffc763b 100644 --- a/src/components/views/right_panel/UserInfo.tsx +++ b/src/components/views/right_panel/UserInfo.tsx @@ -1096,6 +1096,7 @@ function useRoomPermissions(cli: MatrixClient, room: Room, user: RoomMember): IR modifyLevelMax, }); }, [cli, user, room]); + useEventEmitter(cli, "RoomState.members", updateRoomPermissions); useEffect(() => { updateRoomPermissions(); @@ -1702,16 +1703,16 @@ const UserInfo: React.FC = ({ let scopeHeader; if (SpaceStore.spacesEnabled && room?.isSpaceRoom()) { - scopeHeader =
+ scopeHeader =
; } - const header = + const header = <> { scopeHeader } - ; + ; return component.find(`[data-test-id="${id}"]`); + +jest.mock('../../../../src/utils/DMRoomMap', () => { + const mock = { + getUserIdForRoomId: jest.fn(), + getDMRoomsForUserId: jest.fn(), + }; + + return { + shared: jest.fn().mockReturnValue(mock), + sharedInstance: mock, + }; +}); + +describe('', () => { + const defaultUserId = '@test:test'; + const defaultUser = new User(defaultUserId); + + const defaultProps = { + user: defaultUser, + phase: RightPanelPhases.RoomMemberInfo, + onClose: jest.fn(), + }; + + const mockClient = { + getUser: jest.fn(), + isGuest: jest.fn().mockReturnValue(false), + isUserIgnored: jest.fn(), + isCryptoEnabled: jest.fn(), + getUserId: jest.fn(), + on: jest.fn(), + isSynapseAdministrator: jest.fn().mockResolvedValue(false), + isRoomEncrypted: jest.fn().mockReturnValue(false), + doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false), + mxcUrlToHttp: jest.fn().mockReturnValue('mock-mxcUrlToHttp'), + removeListerner: jest.fn(), + currentState: { + on: jest.fn(), + }, + }; + + const verificationRequest = { + pending: true, on: jest.fn(), phase: Phase.Ready, + channel: { transactionId: 1 }, + otherPartySupportsMethod: jest.fn(), + } as unknown as VerificationRequest; + + const getComponent = (props = {}) => mount(, { + wrappingComponent: MatrixClientContext.Provider, + wrappingComponentProps: { value: mockClient }, + }); + + beforeAll(() => { + jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient); + }); + + beforeEach(() => { + mockClient.getUser.mockClear().mockResolvedValue(undefined); + }); + + it('closes on close button click', () => { + const onClose = jest.fn(); + const component = getComponent({ onClose }); + act(() => { + findByTestId(component, 'base-card-close-button').at(0).simulate('click'); + }); + + expect(onClose).toHaveBeenCalled(); + }); + + describe('without a room', () => { + it('does not render space header', () => { + const component = getComponent(); + expect(findByTestId(component, 'space-header').length).toBeFalsy(); + }); + + it('renders user info', () => { + const component = getComponent(); + expect(component.find("BasicUserInfo").length).toBeTruthy(); + }); + + it('renders encryption info panel without pending verification', () => { + const phase = RightPanelPhases.EncryptionPanel; + const component = getComponent({ phase }); + + expect(component.find(EncryptionInfo).length).toBeTruthy(); + }); + + it('renders encryption verification panel with pending verification', () => { + const phase = RightPanelPhases.EncryptionPanel; + const component = getComponent({ phase, verificationRequest }); + + expect(component.find(EncryptionInfo).length).toBeFalsy(); + expect(component.find(VerificationPanel).length).toBeTruthy(); + }); + + it('renders close button correctly when encryption panel with a pending verification request', () => { + const phase = RightPanelPhases.EncryptionPanel; + const component = getComponent({ phase, verificationRequest }); + + expect(findByTestId(component, 'base-card-close-button').at(0).props().title).toEqual('Cancel'); + }); + }); + + describe('with a room', () => { + const room = { + roomId: '!fkfk', + isSpaceRoom: jest.fn().mockReturnValue(false), + getMember: jest.fn().mockReturnValue(undefined), + getMxcAvatarUrl: jest.fn().mockReturnValue('mock-avatar-url'), + name: 'test room', + on: jest.fn(), + currentState: { + getStateEvents: jest.fn(), + on: jest.fn(), + }, + } as unknown as Room; + + it('renders user info', () => { + const component = getComponent(); + expect(component.find("BasicUserInfo").length).toBeTruthy(); + }); + + it('does not render space header when room is not a space room', () => { + const component = getComponent({ room }); + expect(findByTestId(component, 'space-header').length).toBeFalsy(); + }); + + it('renders space header when room is a space room', () => { + const spaceRoom = { + ...room, isSpaceRoom: jest.fn().mockReturnValue(true), + }; + const component = getComponent({ room: spaceRoom }); + expect(findByTestId(component, 'space-header').length).toBeTruthy(); + }); + + it('renders encryption info panel without pending verification', () => { + const phase = RightPanelPhases.EncryptionPanel; + const component = getComponent({ phase, room }); + + expect(component.find(EncryptionInfo).length).toBeTruthy(); + }); + + it('renders encryption verification panel with pending verification', () => { + const phase = RightPanelPhases.EncryptionPanel; + const component = getComponent({ phase, verificationRequest, room }); + + expect(component.find(EncryptionInfo).length).toBeFalsy(); + expect(component.find(VerificationPanel).length).toBeTruthy(); + }); + }); +});