Update vector-im (compound-web to 8.2.1, design tokens is already at 6.0.0 on develop) (#30373)
* Update vector-im * Update snapshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Make BaseDialog's div keyboard focusable and fix test. * Update more e2e tests to use switch instead of checkbox * fix useParticipants incorrectly returning an array when a map is expected * Try again to fix calParticipants * try fix RoomHeader tests again by also mocking useParticipants * Revert "try fix RoomHeader tests again by also mocking useParticipants" This reverts commit f83093cc44586b881d0918e4e4dee60d3263d44b. * Try with no dependencies * try mocking useCall rather than just useParticipantCount * Mock the call store rather than the hook * Only mock the call object for tests that expect it. * Revert "Only mock the call object for tests that expect it." This reverts commit 043d812b1defe75eb7d9c56546317f176b4ba34e. * Revert "Mock the call store rather than the hook" This reverts commit 644be3155c434a309fcfd90a21370a732bb7bdd5. * Revert "try mocking useCall rather than just useParticipantCount" This reverts commit 92034aaff9b46fd135ee4dbcd93dd62ad5985e5e. * Revert "Try with no dependencies" This reverts commit fb502a68a08bd0227ace807fdaf394ed8719d92a. * Reapply "try fix RoomHeader tests again by also mocking useParticipants" This reverts commit e456782efd5ea860cb6679be3adf440788fe40a4. * Revert "try fix RoomHeader tests again by also mocking useParticipants" This reverts commit f83093cc44586b881d0918e4e4dee60d3263d44b. * Revert "Try again to fix calParticipants" This reverts commit c45ad3063f97cad6989ec3fe44dacf6f0904a4e1. * Revert "fix useParticipants incorrectly returning an array when a map is expected" This reverts commit e06d76e3f74d8f77e33247e9f4708bb39aebdce0. * bump compound-web * Update snapshots * Fix bad merge, we don't need the second call to escape. The comment a couple of lines up explains things. * Trigger build to fix licence/cla check --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: David Langley <davidl@element.io>
This commit is contained in:
renovate[bot]
GitHub
@@ -70,12 +70,12 @@ describe("<LayoutSwitcher />", () => {
|
||||
await SettingsStore.setValue("useCompactLayout", null, SettingLevel.DEVICE, true);
|
||||
await renderLayoutSwitcher();
|
||||
|
||||
expect(screen.getByRole("checkbox", { name: "Show compact text and messages" })).toBeChecked();
|
||||
expect(screen.getByRole("switch", { name: "Show compact text and messages" })).toBeChecked();
|
||||
});
|
||||
|
||||
it("should change the setting when toggled", async () => {
|
||||
await renderLayoutSwitcher();
|
||||
act(() => screen.getByRole("checkbox", { name: "Show compact text and messages" }).click());
|
||||
act(() => screen.getByRole("switch", { name: "Show compact text and messages" }).click());
|
||||
|
||||
await waitFor(() => expect(SettingsStore.getValue("useCompactLayout")).toBe(true));
|
||||
});
|
||||
@@ -83,7 +83,7 @@ describe("<LayoutSwitcher />", () => {
|
||||
it("should be disabled when the modern layout is not enabled", async () => {
|
||||
await SettingsStore.setValue("layout", null, SettingLevel.DEVICE, Layout.Bubble);
|
||||
await renderLayoutSwitcher();
|
||||
expect(screen.getByRole("checkbox", { name: "Show compact text and messages" })).toBeDisabled();
|
||||
expect(screen.getByRole("switch", { name: "Show compact text and messages" })).toBeDisabled();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -56,24 +56,24 @@ describe("<ThemeChoicePanel />", () => {
|
||||
describe("system theme", () => {
|
||||
it("should disable Match system theme", async () => {
|
||||
render(<ThemeChoicePanel />);
|
||||
expect(screen.getByRole("checkbox", { name: "Match system theme" })).not.toBeChecked();
|
||||
expect(screen.getByRole("switch", { name: "Match system theme" })).not.toBeChecked();
|
||||
});
|
||||
|
||||
it("should enable Match system theme", async () => {
|
||||
await enableSystemTheme(true);
|
||||
|
||||
render(<ThemeChoicePanel />);
|
||||
expect(screen.getByRole("checkbox", { name: "Match system theme" })).toBeChecked();
|
||||
expect(screen.getByRole("switch", { name: "Match system theme" })).toBeChecked();
|
||||
});
|
||||
|
||||
it("should change the system theme when clicked", async () => {
|
||||
jest.spyOn(SettingsStore, "setValue");
|
||||
|
||||
render(<ThemeChoicePanel />);
|
||||
act(() => screen.getByRole("checkbox", { name: "Match system theme" }).click());
|
||||
act(() => screen.getByRole("switch", { name: "Match system theme" }).click());
|
||||
|
||||
// The system theme should be enabled
|
||||
expect(screen.getByRole("checkbox", { name: "Match system theme" })).toBeChecked();
|
||||
expect(screen.getByRole("switch", { name: "Match system theme" })).toBeChecked();
|
||||
expect(SettingsStore.setValue).toHaveBeenCalledWith("use_system_theme", null, "device", true);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -418,6 +418,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
|
||||
class="_input_19o42_24"
|
||||
id="radix-«rr»"
|
||||
name="compactLayout"
|
||||
role="switch"
|
||||
title=""
|
||||
type="checkbox"
|
||||
/>
|
||||
|
||||
@@ -34,6 +34,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
|
||||
class="_input_19o42_24"
|
||||
id="radix-«r28»"
|
||||
name="systemTheme"
|
||||
role="switch"
|
||||
title=""
|
||||
type="checkbox"
|
||||
/>
|
||||
@@ -312,6 +313,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
|
||||
class="_input_19o42_24"
|
||||
id="radix-«r10»"
|
||||
name="systemTheme"
|
||||
role="switch"
|
||||
title=""
|
||||
type="checkbox"
|
||||
/>
|
||||
@@ -590,6 +592,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
|
||||
class="_input_19o42_24"
|
||||
id="radix-«r0»"
|
||||
name="systemTheme"
|
||||
role="switch"
|
||||
title=""
|
||||
type="checkbox"
|
||||
/>
|
||||
|
||||
@@ -74,7 +74,7 @@ describe("<AdvancedPanel />", () => {
|
||||
await renderAdvancedPanel();
|
||||
|
||||
expect(screen.getByTestId("otherSettings")).toMatchSnapshot();
|
||||
const checkbox = screen.getByRole("checkbox", {
|
||||
const checkbox = screen.getByRole("switch", {
|
||||
name: "In encrypted rooms, only send messages to verified users",
|
||||
});
|
||||
expect(checkbox).toBeChecked();
|
||||
|
||||
@@ -224,6 +224,7 @@ exports[`<AdvancedPanel /> <OtherSettings /> should display the blacklist of unv
|
||||
class="_input_19o42_24"
|
||||
id="radix-«r6»"
|
||||
name="neverSendEncrypted"
|
||||
role="switch"
|
||||
title=""
|
||||
type="checkbox"
|
||||
/>
|
||||
|
||||
@@ -561,6 +561,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
|
||||
class="_input_19o42_24"
|
||||
id="radix-«ru»"
|
||||
name="compactLayout"
|
||||
role="switch"
|
||||
title=""
|
||||
type="checkbox"
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user