From 8399b63e7a2efa81f33b61f1d75bb9eb189e85b1 Mon Sep 17 00:00:00 2001 From: Kerry Date: Thu, 6 Oct 2022 10:35:06 +0200 Subject: [PATCH] fix threadsupport type issues in tests (#9359) --- .../views/context_menus/MessageContextMenu-test.tsx | 4 ++-- test/components/views/messages/MessageActionBar-test.tsx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/components/views/context_menus/MessageContextMenu-test.tsx b/test/components/views/context_menus/MessageContextMenu-test.tsx index 38c646cfe85..10017376bbb 100644 --- a/test/components/views/context_menus/MessageContextMenu-test.tsx +++ b/test/components/views/context_menus/MessageContextMenu-test.tsx @@ -27,7 +27,7 @@ import { EventType, } from 'matrix-js-sdk/src/matrix'; import { ExtensibleEvent, MessageEvent, M_POLL_KIND_DISCLOSED, PollStartEvent } from 'matrix-events-sdk'; -import { Thread } from "matrix-js-sdk/src/models/thread"; +import { FeatureSupport, Thread } from "matrix-js-sdk/src/models/thread"; import { mocked } from "jest-mock"; import { act } from '@testing-library/react'; @@ -469,7 +469,7 @@ describe('MessageContextMenu', () => { const eventContent = MessageEvent.from("hello"); const mxEvent = new MatrixEvent(eventContent.serialize()); - Thread.hasServerSideSupport = true; + Thread.hasServerSideSupport = FeatureSupport.Stable; const context = { canSendMessages: true, }; diff --git a/test/components/views/messages/MessageActionBar-test.tsx b/test/components/views/messages/MessageActionBar-test.tsx index d4dcb1a2dff..670d39ec64c 100644 --- a/test/components/views/messages/MessageActionBar-test.tsx +++ b/test/components/views/messages/MessageActionBar-test.tsx @@ -25,7 +25,7 @@ import { MsgType, Room, } from 'matrix-js-sdk/src/matrix'; -import { Thread } from 'matrix-js-sdk/src/models/thread'; +import { FeatureSupport, Thread } from 'matrix-js-sdk/src/models/thread'; import MessageActionBar from '../../../../src/components/views/messages/MessageActionBar'; import { @@ -388,13 +388,13 @@ describe('', () => { describe('thread button', () => { beforeEach(() => { - Thread.setServerSideSupport(true, false); + Thread.setServerSideSupport(FeatureSupport.Stable); }); describe('when threads feature is not enabled', () => { it('does not render thread button when threads does not have server support', () => { jest.spyOn(SettingsStore, 'getValue').mockReturnValue(false); - Thread.setServerSideSupport(false, false); + Thread.setServerSideSupport(FeatureSupport.None); const { queryByLabelText } = getComponent({ mxEvent: alicesMessageEvent }); expect(queryByLabelText('Reply in thread')).toBeFalsy(); });