mirror of
https://github.com/vector-im/element-web.git
synced 2025-11-13 06:31:09 +01:00
* Default to new room list and enforce in config for app and develop * Update jest tests * Update LandmarkNavigation and e2e test * Update viewRoomByName helper * lint * Update Add -> New Room flow Keep legacy viewRoomByName until we delete the olds tests. * Update e2e test to use Add -> Start Chat * Update screenshots * Fix viewRoomByName, can't use option as it contains more that just the room name. Using title which should be exact. * Fix knocking tests * fix layout.spec.ts and pstn.spec * timeline snapshots * Fix spotlight.spec * TAC spaces and media preview settings * Fix more screenshots and mark as unread tests * Fix leftpanel test * Bugfix for knocking use case. We should check EffectiveMembership when remove rooms from the new room list, so that knocking is handled * Fix openCreateRoomDialog to new room list specifics to fix create-knock-room.spec.ts * lint * Fix Landmark navigation from left panel search to the next landmark * lint * Update window-12px-linux.png * Update apps-drawer-linux.png * Update sliding sync e2e tests * Update some screenshots * Revert change to the space create screenshot * Use actual screenshot as focused elements are different when generated locally * Fix test selectors * Morfe test screenshot selector / update * Add test for landmark navigation * Replace screenshots * Fix another test that just got added an hour ago * Not sure why this was changed, doesn't seem necessary * Disambiguate selector * Another screenshot that's now changed in width by 1px * Revert changes to config files It's being turned on by default so these are unnecessary * Convert read.unread assertions to new room list removing support for checking for activity in assertUnread which was unused. * Update room list order tests that feel a bit like they ought to be in room-list rather than read-receipts but whatever * Fix room titles in read receipts test --------- Co-authored-by: David Baker <dbkr@users.noreply.github.com>
123 lines
5.6 KiB
TypeScript
123 lines
5.6 KiB
TypeScript
/*
|
|
* Copyright 2024 New Vector Ltd.
|
|
* Copyright 2024 The Matrix.org Foundation C.I.C.
|
|
*
|
|
* SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
|
|
* Please see LICENSE files in the repository root for full details.
|
|
*/
|
|
|
|
import { render, screen, waitFor } from "jest-matrix-react";
|
|
import React from "react";
|
|
|
|
import { Landmark, LandmarkNavigation } from "../../../src/accessibility/LandmarkNavigation";
|
|
import defaultDispatcher from "../../../src/dispatcher/dispatcher";
|
|
|
|
describe("KeyboardLandmarkUtils", () => {
|
|
it("Landmarks are cycled through correctly without an opened room", () => {
|
|
render(
|
|
<div>
|
|
<div tabIndex={0} className="mx_SpaceButton_active" data-testid="mx_SpaceButton_active">
|
|
SPACE_BUTTON
|
|
</div>
|
|
<div tabIndex={0} className="mx_RoomListSearch_search" data-testid="mx_RoomListSearch_search">
|
|
ROOM_SEARCH
|
|
</div>
|
|
<div tabIndex={0} className="mx_RoomListItemView" data-testid="mx_RoomListItemView">
|
|
ROOM_TILE
|
|
</div>
|
|
<div tabIndex={0} className="mx_HomePage" data-testid="mx_HomePage">
|
|
HOME_PAGE
|
|
</div>
|
|
</div>,
|
|
);
|
|
// ACTIVE_SPACE_BUTTON <-> ROOM_SEARCH <-> ROOM_LIST <-> HOME <-> ACTIVE_SPACE_BUTTON
|
|
// ACTIVE_SPACE_BUTTON -> ROOM_SEARCH
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ACTIVE_SPACE_BUTTON);
|
|
expect(screen.getByTestId("mx_RoomListSearch_search")).toHaveFocus();
|
|
|
|
// ROOM_SEARCH -> ROOM_LIST
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_SEARCH);
|
|
expect(screen.getByTestId("mx_RoomListItemView")).toHaveFocus();
|
|
|
|
// ROOM_LIST -> HOME_PAGE
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_LIST);
|
|
expect(screen.getByTestId("mx_HomePage")).toHaveFocus();
|
|
|
|
// HOME_PAGE -> ACTIVE_SPACE_BUTTON
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.MESSAGE_COMPOSER_OR_HOME);
|
|
expect(screen.getByTestId("mx_SpaceButton_active")).toHaveFocus();
|
|
|
|
// HOME_PAGE <- ACTIVE_SPACE_BUTTON
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ACTIVE_SPACE_BUTTON, true);
|
|
expect(screen.getByTestId("mx_HomePage")).toHaveFocus();
|
|
|
|
// ROOM_LIST <- HOME_PAGE
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.MESSAGE_COMPOSER_OR_HOME, true);
|
|
expect(screen.getByTestId("mx_RoomListItemView")).toHaveFocus();
|
|
|
|
// ROOM_SEARCH <- ROOM_LIST
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_LIST, true);
|
|
expect(screen.getByTestId("mx_RoomListSearch_search")).toHaveFocus();
|
|
|
|
// ACTIVE_SPACE_BUTTON <- ROOM_SEARCH
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_SEARCH, true);
|
|
expect(screen.getByTestId("mx_SpaceButton_active")).toHaveFocus();
|
|
});
|
|
|
|
it("Landmarks are cycled through correctly with an opened room", async () => {
|
|
const callback = jest.fn();
|
|
defaultDispatcher.register(callback);
|
|
render(
|
|
<div>
|
|
<div tabIndex={0} className="mx_SpaceButton_active" data-testid="mx_SpaceButton_active">
|
|
SPACE_BUTTON
|
|
</div>
|
|
<div tabIndex={0} className="mx_RoomListSearch_search" data-testid="mx_RoomListSearch_search">
|
|
ROOM_SEARCH
|
|
</div>
|
|
<div tabIndex={0} className="mx_RoomListItemView_selected" data-testid="mx_RoomListItemView_selected">
|
|
ROOM_TILE
|
|
</div>
|
|
<div tabIndex={0} className="mx_Room" data-testid="mx_Room">
|
|
ROOM
|
|
<div tabIndex={0} className="mx_MessageComposer">
|
|
COMPOSER
|
|
</div>
|
|
</div>
|
|
</div>,
|
|
);
|
|
// ACTIVE_SPACE_BUTTON <-> ROOM_SEARCH <-> ROOM_LIST <-> MESSAGE_COMPOSER <-> ACTIVE_SPACE_BUTTON
|
|
// ACTIVE_SPACE_BUTTON -> ROOM_SEARCH
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ACTIVE_SPACE_BUTTON);
|
|
expect(screen.getByTestId("mx_RoomListSearch_search")).toHaveFocus();
|
|
|
|
// ROOM_SEARCH -> ROOM_LIST
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_SEARCH);
|
|
expect(screen.getByTestId("mx_RoomListItemView_selected")).toHaveFocus();
|
|
|
|
// ROOM_LIST -> MESSAGE_COMPOSER
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_LIST);
|
|
await waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
|
|
|
// MESSAGE_COMPOSER -> ACTIVE_SPACE_BUTTON
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.MESSAGE_COMPOSER_OR_HOME);
|
|
expect(screen.getByTestId("mx_SpaceButton_active")).toHaveFocus();
|
|
|
|
// MESSAGE_COMPOSER <- ACTIVE_SPACE_BUTTON
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ACTIVE_SPACE_BUTTON, true);
|
|
await waitFor(() => expect(callback).toHaveBeenCalledTimes(2));
|
|
|
|
// ROOM_LIST <- MESSAGE_COMPOSER
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.MESSAGE_COMPOSER_OR_HOME, true);
|
|
expect(screen.getByTestId("mx_RoomListItemView_selected")).toHaveFocus();
|
|
|
|
// ROOM_SEARCH <- ROOM_LIST
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_LIST, true);
|
|
expect(screen.getByTestId("mx_RoomListSearch_search")).toHaveFocus();
|
|
|
|
// ACTIVE_SPACE_BUTTON <- ROOM_SEARCH
|
|
LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_SEARCH, true);
|
|
expect(screen.getByTestId("mx_SpaceButton_active")).toHaveFocus();
|
|
});
|
|
});
|