Store test files alongside source files

This way we benefit from not having to maintain the same directory structure twice, and our linters etc. will actually lint test files by default.

Author: robintown

src/Avatar.tsx

@@ -17,7 +17,7 @@ limitations under the License.
 import { useMemo, FC } from "react";
 import { Avatar as CompoundAvatar } from "@vector-im/compound-web";
 
-import { getAvatarUrl } from "./matrix-utils";
+import { getAvatarUrl } from "./utils/matrix";
 import { useClient } from "./ClientContext";
 
 export enum Size {

src/ClientContext.tsx

@@ -39,7 +39,7 @@ import {
   CryptoStoreIntegrityError,
   fallbackICEServerAllowed,
   initClient,
-} from "./matrix-utils";
+} from "./utils/matrix";
 import { widget } from "./widget";
 import {
   PosthogAnalytics,

test/Toast-test.tsx renamed to src/Toast.test.tsx

@@ -16,9 +16,10 @@ limitations under the License.
 
 import { vi } from "vitest";
 import { screen, render } from "@testing-library/react";
-import { Toast } from "../src/Toast";
 import userEvent from "@testing-library/user-event";
-import { withFakeTimers } from "./utils";
+
+import { Toast } from "../src/Toast";
+import { withFakeTimers } from "./utils/test";
 
 test("Toast renders", () => {
   render(

test/UrlParams-test.ts renamed to src/UrlParams.test.ts

@@ -0,0 +1,21 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`Toast renders 1`] = `
+<button
+  aria-labelledby="radix-:r4:"
+  class="overlay animate toast"
+  data-state="open"
+  id="radix-:r3:"
+  role="dialog"
+  style="pointer-events: auto;"
+  tabindex="-1"
+  type="button"
+>
+  <h3
+    class="_typography_yh5dq_162 _font-body-sm-semibold_yh5dq_45"
+    id="radix-:r4:"
+  >
+    Hello world!
+  </h3>
+</button>
+`;

test/__snapshots__/Toast-test.tsx.snap renamed to src/__snapshots__/Toast-test.tsx.snap

@@ -22,7 +22,7 @@ import {
   MatrixClient,
 } from "matrix-js-sdk/src/matrix";
 
-import { initClient } from "../matrix-utils";
+import { initClient } from "../utils/matrix";
 import { Session } from "../ClientContext";
 
 export function useInteractiveLogin(): (

src/__snapshots__/Toast.test.tsx.snap

@@ -22,7 +22,7 @@ import {
   RegisterResponse,
 } from "matrix-js-sdk/src/matrix";
 
-import { initClient } from "../matrix-utils";
+import { initClient } from "../utils/matrix";
 import { Session } from "../ClientContext";
 import { Config } from "../config/Config";
 import { widget } from "../widget";

src/auth/useInteractiveLogin.ts

@@ -15,11 +15,11 @@ limitations under the License.
 */
 
 import { render, RenderResult } from "@testing-library/react";
-import { CallList } from "../../src/home/CallList";
 import { MatrixClient } from "matrix-js-sdk";
-import { GroupCallRoom } from "../../src/home/useGroupCallRooms";
 import { MemoryRouter } from "react-router-dom";
-import { ClientProvider } from "../../src/ClientContext";
+
+import { CallList } from "../../src/home/CallList";
+import { GroupCallRoom } from "../../src/home/useGroupCallRooms";
 
 describe("CallList", () => {
   const renderComponent = (rooms: GroupCallRoom[]): RenderResult => {

src/auth/useInteractiveRegistration.ts

@@ -23,7 +23,7 @@ import { FC } from "react";
 import { CopyButton } from "../button";
 import { Avatar, Size } from "../Avatar";
 import styles from "./CallList.module.css";
-import { getAbsoluteRoomUrl, getRelativeRoomUrl } from "../matrix-utils";
+import { getAbsoluteRoomUrl, getRelativeRoomUrl } from "../utils/matrix";
 import { Body } from "../typography/Typography";
 import { GroupCallRoom } from "./useGroupCallRooms";
 import { useRoomEncryptionSystem } from "../e2ee/sharedKeyManagement";

test/home/CallList-test.tsx renamed to src/home/CallList.test.tsx

@@ -26,7 +26,7 @@ import {
   getRelativeRoomUrl,
   roomAliasLocalpartFromRoomName,
   sanitiseRoomNameInput,
-} from "../matrix-utils";
+} from "../utils/matrix";
 import { useGroupCallRooms } from "./useGroupCallRooms";
 import { Header, HeaderLogo, LeftNav, RightNav } from "../Header";
 import commonStyles from "./common.module.css";

src/home/CallList.tsx

@@ -31,7 +31,7 @@ import {
   getRelativeRoomUrl,
   roomAliasLocalpartFromRoomName,
   sanitiseRoomNameInput,
-} from "../matrix-utils";
+} from "../utils/matrix";
 import { useInteractiveRegistration } from "../auth/useInteractiveRegistration";
 import { JoinExistingCallModal } from "./JoinExistingCallModal";
 import { useRecaptcha } from "../auth/useRecaptcha";

src/home/RegisteredView.tsx

@@ -1,9 +1,26 @@
+/*
+Copyright 2024 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import { GroupCallStatsReport } from "matrix-js-sdk/src/webrtc/groupCall";
 import {
   AudioConcealment,
   ByteSentStatsReport,
   ConnectionStatsReport,
 } from "matrix-js-sdk/src/webrtc/stats/statsReport";
+
 import { ObjectFlattener } from "../../src/otel/ObjectFlattener";
 
 /*

src/home/UnauthenticatedView.tsx

@@ -22,7 +22,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import { Modal } from "../Modal";
 import { useRoomEncryptionSystem } from "../e2ee/sharedKeyManagement";
-import { getAbsoluteRoomUrl } from "../matrix-utils";
+import { getAbsoluteRoomUrl } from "../utils/matrix";
 import styles from "./AppSelectionModal.module.css";
 import { editFragmentQuery } from "../UrlParams";
 import { E2eeType } from "../e2ee/e2eeType";

test/initializer-test.ts renamed to src/initializer.test.ts

@@ -35,7 +35,7 @@ import { MatrixInfo } from "./VideoPreview";
 import { CallEndedView } from "./CallEndedView";
 import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
 import { useProfile } from "../profile/useProfile";
-import { findDeviceByName } from "../media-utils";
+import { findDeviceByName } from "../utils/media";
 import { ActiveCall } from "./InCallView";
 import { MUTE_PARTICIPANT_COUNT, MuteStates } from "./MuteStates";
 import { useMediaDevices, MediaDevices } from "../livekit/MediaDevicesContext";

test/otel/ObjectFlattener-test.ts renamed to src/otel/ObjectFlattener.test.ts

@@ -23,7 +23,7 @@ import CheckIcon from "@vector-im/compound-design-tokens/icons/check.svg?react";
 import useClipboard from "react-use-clipboard";
 
 import { Modal } from "../Modal";
-import { getAbsoluteRoomUrl } from "../matrix-utils";
+import { getAbsoluteRoomUrl } from "../utils/matrix";
 import styles from "./InviteModal.module.css";
 import { Toast } from "../Toast";
 import { useRoomEncryptionSystem } from "../e2ee/sharedKeyManagement";

src/room/AppSelectionModal.tsx

@@ -16,13 +16,14 @@ limitations under the License.
 
 import { vi, Mocked } from "vitest";
 import { RoomState } from "matrix-js-sdk/src/models/room-state";
+
 import { PosthogAnalytics } from "../../src/analytics/PosthogAnalytics";
 import { checkForParallelCalls } from "../../src/room/checkForParallelCalls";
-import { withFakeTimers } from "../utils";
+import { withFakeTimers } from "../utils/test";
 
 const withMockedPosthog = (
   continuation: (posthog: Mocked<PosthogAnalytics>) => void,
-) => {
+): void => {
   const posthog = vi.mocked({
     trackEvent: vi.fn(),
   } as unknown as PosthogAnalytics);
@@ -40,7 +41,7 @@ const mockRoomState = (
   groupCallMemberContents: Record<string, unknown>[],
 ): RoomState => {
   const stateEvents = groupCallMemberContents.map((content) => ({
-    getContent: () => content,
+    getContent: (): Record<string, unknown> => content,
   }));
   return { getStateEvents: () => stateEvents } as unknown as RoomState;
 };

src/room/GroupCallView.tsx

@@ -67,7 +67,7 @@ import {
   ScreenShareViewModel,
   UserMediaViewModel,
 } from "./MediaViewModel";
-import { accumulate, finalizeValue } from "../observable-utils";
+import { accumulate, finalizeValue } from "../utils/observable";
 import { ObservableScope } from "./ObservableScope";
 
 // How long we wait after a focus switch before showing the real participant

src/room/InviteModal.tsx

@@ -32,12 +32,12 @@ import { secureRandomBase64Url } from "matrix-js-sdk/src/randomstring";
 
 import type { MatrixClient } from "matrix-js-sdk/src/client";
 import type { Room } from "matrix-js-sdk/src/models/room";
-import IndexedDBWorker from "./IndexedDBWorker?worker";
-import { generateUrlSearchParams, getUrlParams } from "./UrlParams";
-import { loadOlm } from "./olm";
-import { Config } from "./config/Config";
-import { E2eeType } from "./e2ee/e2eeType";
-import { EncryptionSystem, saveKeyForRoom } from "./e2ee/sharedKeyManagement";
+import IndexedDBWorker from "../IndexedDBWorker?worker";
+import { generateUrlSearchParams, getUrlParams } from "../UrlParams";
+import { loadOlm } from "../olm";
+import { Config } from "../config/Config";
+import { E2eeType } from "../e2ee/e2eeType";
+import { EncryptionSystem, saveKeyForRoom } from "../e2ee/sharedKeyManagement";
 
 export const fallbackICEServerAllowed =
   import.meta.env.VITE_FALLBACK_STUN_ALLOWED === "true";

test/room/checkForParallelCalls-test.ts renamed to src/room/checkForParallelCalls.test.ts

@@ -48,8 +48,6 @@
     "./node_modules/matrix-js-sdk/src/@types/*.d.ts",
     "./node_modules/vitest/globals.d.ts",
     "./src/**/*.ts",
-    "./src/**/*.tsx",
-    "./test/**/*.ts",
-    "./test/**/*.tsx"
+    "./src/**/*.tsx"
   ]
 }

test/rtcSessionHelper-test.ts renamed to src/rtcSessionHelper.test.ts

@@ -13,9 +13,8 @@ export default defineConfig((configEnv) =>
             classNameStrategy: "non-scoped",
           },
         },
-        include: ["test/**/*-test.[jt]s?(x)"],
         isolate: false,
-        setupFiles: ["test/setup.ts"],
+        setupFiles: ["src/vitest.setup.ts"],
         coverage: {
           reporter: ["html", "json"],
           include: ["src/"],