matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-07 21:23:00 +03:00
Code Activity

Stablize test

Browse Source
This commit is contained in:
Half-Shot
2024-09-10 10:35:38 +01:00
parent 2a14aee55d
commit c43048d2f1
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/views/right_panel/UserInfo.tsx
View File

@@ -1710,7 +1710,6 @@ export const UserInfoHeader: React.FC<{
withDisplayName: true, withDisplayName: true,
}); });
const displayName = (member as RoomMember).rawDisplayName; const displayName = (member as RoomMember).rawDisplayName;
console.log("booop", timezoneInfo);
return ( return (
<React.Fragment> <React.Fragment>
<div className="mx_UserInfo_avatar"> <div className="mx_UserInfo_avatar">
@@ -1738,13 +1737,15 @@ export const UserInfoHeader: React.FC<{
</Flex> </Flex>
</Heading> </Heading>
{presenceLabel} {presenceLabel}
{timezoneInfo && <Tooltip label={timezoneInfo?.timezone ?? ""}> {timezoneInfo && (
<span className="mx_UserInfo_timezone"> <Tooltip label={timezoneInfo?.timezone ?? ""}>
<Text size="sm" weight="regular"> <span className="mx_UserInfo_timezone">
{timezoneInfo?.friendly ?? ""} <Text size="sm" weight="regular">
</Text> {timezoneInfo?.friendly ?? ""}
</span> </Text>
</Tooltip>} </span>
</Tooltip>
)}
<Text size="sm" weight="semibold" className="mx_UserInfo_profile_mxid"> <Text size="sm" weight="semibold" className="mx_UserInfo_profile_mxid">
<CopyableText getTextToCopy={() => userIdentifier} border={false}> <CopyableText getTextToCopy={() => userIdentifier} border={false}>
{userIdentifier} {userIdentifier}

7
test/components/views/right_panel/UserInfo-test.tsx
View File

@@ -100,6 +100,7 @@ let mockRoom: Mocked<Room>;
let mockSpace: Mocked<Room>; let mockSpace: Mocked<Room>;
let mockClient: Mocked<MatrixClient>; let mockClient: Mocked<MatrixClient>;
let mockCrypto: Mocked<CryptoApi>; let mockCrypto: Mocked<CryptoApi>;
const origDate = global.Date.prototype.toLocaleString;
beforeEach(() => { beforeEach(() => {
mockRoom = mocked({ mockRoom = mocked({
@@ -240,10 +241,14 @@ describe("<UserInfo />", () => {
}); });
it("renders user timezone if set", async () => { it("renders user timezone if set", async () => {
// For timezone, force a consistent locale.
jest.spyOn(global.Date.prototype, "toLocaleString").mockImplementation(function (_locale, opts) {
return origDate.call(this, "en-US", opts); // eslint-disable-line @typescript-eslint/no-invalid-this
});
mockClient.doesServerSupportExtendedProfiles.mockResolvedValue(true); mockClient.doesServerSupportExtendedProfiles.mockResolvedValue(true);
mockClient.getExtendedProfileProperty.mockResolvedValue("Europe/London"); mockClient.getExtendedProfileProperty.mockResolvedValue("Europe/London");
renderComponent(); renderComponent();
await expect(screen.findByText(/\d\d:\d\d (am|pm)/)).resolves.toBeInTheDocument(); await expect(screen.findByText(/\d\d:\d\d (AM|PM)/)).resolves.toBeInTheDocument();
}); });
it("renders encryption info panel without pending verification", () => { it("renders encryption info panel without pending verification", () => {