Merge branch 'develop' into germain-gg/notifications-labs
This commit is contained in:
commit
9ceac6eae1
148 changed files with 14554 additions and 11595 deletions
|
@ -141,7 +141,7 @@ describe("RoomKnocksBar", () => {
|
|||
expect(container.firstChild).toBeNull();
|
||||
jest.spyOn(room, "getMembersWithMembership").mockReturnValue([bob]);
|
||||
act(() => {
|
||||
room.emit(RoomStateEvent.Members, new MatrixEvent(), state, bob);
|
||||
room.emit(RoomStateEvent.Update, state);
|
||||
});
|
||||
expect(container.firstChild).not.toBeNull();
|
||||
});
|
||||
|
@ -151,7 +151,7 @@ describe("RoomKnocksBar", () => {
|
|||
expect(screen.getByRole("heading")).toHaveTextContent("Asking to join");
|
||||
jest.spyOn(room, "getMembersWithMembership").mockReturnValue([bob, jane]);
|
||||
act(() => {
|
||||
room.emit(RoomStateEvent.Members, new MatrixEvent(), state, jane);
|
||||
room.emit(RoomStateEvent.Update, state);
|
||||
});
|
||||
expect(screen.getByRole("heading")).toHaveTextContent("2 people asking to join");
|
||||
});
|
||||
|
|
|
@ -12,7 +12,6 @@ exports[`<PinnedEventTile /> should render pinned event 1`] = `
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 24px;"
|
||||
title="@alice:server.org"
|
||||
>
|
||||
a
|
||||
</span>
|
||||
|
|
|
@ -13,7 +13,6 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 40px;"
|
||||
title="!1:example.org"
|
||||
>
|
||||
!
|
||||
</span>
|
||||
|
@ -37,6 +36,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
|
|||
>
|
||||
<button
|
||||
class="_icon-button_1k9cw_17"
|
||||
data-state="closed"
|
||||
disabled=""
|
||||
style="--cpd-icon-button-size: 32px;"
|
||||
title="There's no one here to call"
|
||||
|
@ -45,6 +45,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
|
|||
</button>
|
||||
<button
|
||||
class="_icon-button_1k9cw_17"
|
||||
data-state="closed"
|
||||
disabled=""
|
||||
style="--cpd-icon-button-size: 32px;"
|
||||
title="There's no one here to call"
|
||||
|
@ -53,6 +54,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
|
|||
</button>
|
||||
<button
|
||||
class="_icon-button_1k9cw_17"
|
||||
data-state="closed"
|
||||
style="--cpd-icon-button-size: 32px;"
|
||||
title="Threads"
|
||||
>
|
||||
|
|
|
@ -29,7 +29,6 @@ exports[`<RoomPreviewBar /> message case AskToJoin renders the corresponding mes
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 36px;"
|
||||
title="RoomPreviewBar-test-room"
|
||||
>
|
||||
R
|
||||
</span>
|
||||
|
@ -55,7 +54,6 @@ exports[`<RoomPreviewBar /> message case AskToJoin renders the corresponding mes
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 36px;"
|
||||
title=""
|
||||
>
|
||||
?
|
||||
</span>
|
||||
|
@ -222,7 +220,6 @@ exports[`<RoomPreviewBar /> with an invite with an invited email when client has
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 36px;"
|
||||
title="RoomPreviewBar-test-room"
|
||||
>
|
||||
R
|
||||
</span>
|
||||
|
@ -281,7 +278,6 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a dm roo
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 36px;"
|
||||
title="RoomPreviewBar-test-room"
|
||||
>
|
||||
R
|
||||
</span>
|
||||
|
@ -347,7 +343,6 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a non-dm
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 36px;"
|
||||
title="RoomPreviewBar-test-room"
|
||||
>
|
||||
R
|
||||
</span>
|
||||
|
|
|
@ -20,7 +20,6 @@ exports[`RoomTile when message previews are enabled and there is a message in a
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 32px;"
|
||||
title="!1:example.org"
|
||||
>
|
||||
!
|
||||
</span>
|
||||
|
@ -95,7 +94,6 @@ exports[`RoomTile when message previews are enabled and there is a message in th
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 32px;"
|
||||
title="!1:example.org"
|
||||
>
|
||||
!
|
||||
</span>
|
||||
|
@ -170,7 +168,6 @@ exports[`RoomTile when message previews are enabled should render a room without
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 32px;"
|
||||
title="!1:example.org"
|
||||
>
|
||||
!
|
||||
</span>
|
||||
|
@ -233,7 +230,6 @@ exports[`RoomTile when message previews are not enabled should render the room 1
|
|||
data-type="round"
|
||||
role="presentation"
|
||||
style="--cpd-avatar-size: 32px;"
|
||||
title="!1:example.org"
|
||||
>
|
||||
!
|
||||
</span>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue