Step 8.1: Remove skinning setup from all tests

Author: turt2live

scripts/make-react-component.js

@@ -6,7 +6,7 @@ const path = require('path');
  * Unsophisticated script to create a styled, unit-tested react component.
  * -filePath / -f : path to the component to be created, including new component name, excluding extension, relative to src
  * -withStyle / -s : optional, flag to create a style file for the component. Defaults to false.
- * 
+ *
  * eg:
  * ```
  * node srcipts/make-react-component.js -f components/toasts/NewToast -s
@@ -15,7 +15,7 @@ const path = require('path');
  * - src/components/toasts/NewToast.tsx
  * - test/components/toasts/NewToast-test.tsx
  * - res/css/components/toasts/_NewToast.scss
- * 
+ *
  */
 
 const TEMPLATES = {
@@ -34,7 +34,6 @@ export default %%ComponentName%%;
 import React from 'react';
 import { mount } from 'enzyme';
 
-import '%%SkinnedSdkPath%%';
 import %%ComponentName%% from '%%RelativeComponentPath%%';
 
 describe('<%%ComponentName%% />', () => {
@@ -85,10 +84,8 @@ const makeFile = async ({
     const relativePathToComponent = path.parse(path.relative(path.dirname(newFilePath), componentFilePath || ''));
     const importComponentPath = path.join(relativePathToComponent.dir, relativePathToComponent.name);
 
-    const skinnedSdkPath = path.relative(path.dirname(newFilePath), 'test/skinned-sdk')
-
     try {
-        await fs.writeFile(newFilePath, fillTemplate(template, componentName, importComponentPath, skinnedSdkPath), { flag: 'wx' });
+        await fs.writeFile(newFilePath, fillTemplate(template, componentName, importComponentPath), { flag: 'wx' });
         console.log(`Created ${path.relative(process.cwd(), newFilePath)}`);
         return newFilePath;
     } catch (error) {
@@ -104,7 +101,6 @@ const makeFile = async ({
 const fillTemplate = (template, componentName, relativeComponentFilePath, skinnedSdkPath) =>
     template.replace(/%%ComponentName%%/g, componentName)
         .replace(/%%RelativeComponentPath%%/g, relativeComponentFilePath)
-        .replace(/%%SkinnedSdkPath%%/g, skinnedSdkPath)
 
 
 const makeReactComponent = async () => {

test/CallHandler-test.ts

@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import './skinned-sdk';
-
 import { IProtocol } from 'matrix-js-sdk/src/matrix';
 import { CallEvent, CallState, CallType } from 'matrix-js-sdk/src/webrtc/call';
 import EventEmitter from 'events';

test/DecryptionFailureTracker-test.js

@@ -16,7 +16,6 @@ limitations under the License.
 
 import { MatrixEvent } from 'matrix-js-sdk/src/matrix';
 
-import './skinned-sdk'; // Must be first for skinning to work
 import { DecryptionFailureTracker } from '../src/DecryptionFailureTracker';
 
 class MockDecryptionError extends Error {

test/DeviceListener-test.ts

@@ -19,7 +19,6 @@ import { EventEmitter } from "events";
 import { mocked } from "jest-mock";
 import { Room } from "matrix-js-sdk/src/matrix";
 
-import './skinned-sdk';
 import DeviceListener from "../src/DeviceListener";
 import { MatrixClientPeg } from "../src/MatrixClientPeg";
 import * as SetupEncryptionToast from "../src/toasts/SetupEncryptionToast";

test/Image-test.ts

@@ -17,7 +17,6 @@ limitations under the License.
 import fs from "fs";
 import path from "path";
 
-import './skinned-sdk';
 import { blobIsAnimated, mayBeAnimated } from "../src/utils/Image";
 
 describe("Image", () => {

test/Reply-test.ts

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import './skinned-sdk';
 import {
     getNestedReplyText,
     getParentEventId,

test/TextForEvent-test.ts

@@ -1,5 +1,3 @@
-import './skinned-sdk';
-
 import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";
 import TestRenderer from 'react-test-renderer';
 

test/accessibility/RovingTabIndex-test.tsx

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import '../skinned-sdk'; // Must be first for skinning to work
 import * as React from "react";
 import { mount, ReactWrapper } from "enzyme";
 

test/audio/Playback-test.ts

@@ -17,8 +17,6 @@ limitations under the License.
 import { mocked } from 'jest-mock';
 import { logger } from 'matrix-js-sdk/src/logger';
 
-import '../skinned-sdk'; // Must be first for skinning to work
-
 import { createAudioContext, decodeOgg } from '../../src/audio/compat';
 import { Playback, PlaybackState } from "../../src/audio/Playback";
 

test/components/structures/CallEventGrouper-test.ts

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../../skinned-sdk";
 import { MatrixClient, MatrixEvent } from 'matrix-js-sdk/src/matrix';
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { CallState } from "matrix-js-sdk/src/webrtc/call";

test/components/structures/RightPanel-test.tsx

@@ -19,8 +19,6 @@ import TestRenderer from "react-test-renderer";
 import { jest } from "@jest/globals";
 import { Room } from "matrix-js-sdk/src/models/room";
 
-// We can't use the usual `skinned-sdk`, as it stubs out the RightPanel
-import "../../minimal-sdk";
 import RightPanel from "../../../src/components/structures/RightPanel";
 import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
 import ResizeNotifier from "../../../src/utils/ResizeNotifier";

test/components/structures/ThreadPanel-test.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import { shallow, mount } from "enzyme";
-import '../../skinned-sdk';
 
 import {
     ThreadFilterType,

test/components/views/audio_messages/RecordingPlayback-test.tsx

@@ -20,7 +20,6 @@ import { mocked } from 'jest-mock';
 import { logger } from 'matrix-js-sdk/src/logger';
 import { act } from 'react-dom/test-utils';
 
-import '../../../skinned-sdk';
 import RecordingPlayback from '../../../../src/components/views/audio_messages/RecordingPlayback';
 import { Playback } from '../../../../src/audio/Playback';
 import RoomContext, { TimelineRenderingType } from '../../../../src/contexts/RoomContext';

test/components/views/context_menus/ContextMenu-test.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import { mount } from "enzyme";
 
-import "../../../skinned-sdk";
 import ContextMenu, { ChevronFace } from "../../../../src/components/structures/ContextMenu";
 import UIStore from "../../../../src/stores/UIStore";
 

test/components/views/context_menus/MessageContextMenu-test.tsx

@@ -21,7 +21,6 @@ import { Room } from 'matrix-js-sdk/src/models/room';
 import { PendingEventOrdering } from 'matrix-js-sdk/src/matrix';
 import { ExtensibleEvent, MessageEvent, M_POLL_KIND_DISCLOSED, PollStartEvent } from 'matrix-events-sdk';
 
-import '../../../skinned-sdk';
 import * as TestUtils from '../../../test-utils';
 import MessageContextMenu from '../../../../src/components/views/context_menus/MessageContextMenu';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';

test/components/views/context_menus/SpaceContextMenu-test.tsx

@@ -20,7 +20,6 @@ import { Room } from 'matrix-js-sdk/src/matrix';
 import { mocked } from 'jest-mock';
 import { act } from 'react-dom/test-utils';
 
-import '../../../skinned-sdk';
 import SpaceContextMenu from '../../../../src/components/views/context_menus/SpaceContextMenu';
 import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
 import { findByTestId } from '../../../test-utils';

test/components/views/dialogs/ExportDialog-test.tsx

@@ -20,7 +20,6 @@ import { mocked } from 'jest-mock';
 import { act } from "react-dom/test-utils";
 import { Room } from 'matrix-js-sdk/src/matrix';
 
-import '../../../skinned-sdk';
 import ExportDialog from '../../../../src/components/views/dialogs/ExportDialog';
 import { ExportType, ExportFormat } from '../../../../src/utils/exportUtils/exportUtils';
 import { createTestClient, mkStubRoom } from '../../../test-utils';

test/components/views/dialogs/ForwardDialog-test.js

@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../../../skinned-sdk";
-
 import React from "react";
 import { mount } from "enzyme";
 import { act } from "react-dom/test-utils";

test/components/views/elements/AppTile-test.tsx

@@ -20,8 +20,6 @@ import { jest } from "@jest/globals";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { MatrixWidgetType } from "matrix-widget-api";
 
-// We can't use the usual `skinned-sdk`, as it stubs out the RightPanel
-import "../../../minimal-sdk";
 import RightPanel from "../../../../src/components/structures/RightPanel";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import ResizeNotifier from "../../../../src/utils/ResizeNotifier";

test/components/views/elements/InteractiveTooltip-test.ts

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import '../../../skinned-sdk';
 import { Direction, mouseWithinRegion } from "../../../../src/components/views/elements/InteractiveTooltip";
 
 describe("InteractiveTooltip", () => {

test/components/views/elements/PollCreateDialog-test.tsx

@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// skinned-sdk should be the first import in most tests
-import '../../../skinned-sdk';
 import React from "react";
 import { mount, ReactWrapper } from "enzyme";
 import { Room } from "matrix-js-sdk/src/models/room";

test/components/views/elements/ReplyChain-test.tsx

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../../../skinned-sdk";
 import * as testUtils from '../../../test-utils';
 import { getParentEventId } from "../../../../src/utils/Reply";
 

test/components/views/elements/StyledRadioGroup-test.tsx

@@ -13,7 +13,6 @@ 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 "../../../skinned-sdk";
 
 import React from 'react';
 import { mount } from 'enzyme';

test/components/views/elements/TooltipTarget-test.tsx

@@ -1,5 +1,3 @@
-// skinned-sdk should be the first import in most tests
-import '../../../skinned-sdk';
 import React from "react";
 import {
     renderIntoDocument,

test/components/views/location/LocationPicker-test.tsx

@@ -23,7 +23,6 @@ import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { mocked } from 'jest-mock';
 import { logger } from 'matrix-js-sdk/src/logger';
 
-import "../../../skinned-sdk"; // Must be first for skinning to work
 import LocationPicker from "../../../../src/components/views/location/LocationPicker";
 import { LocationShareType } from "../../../../src/components/views/location/shareLocation";
 import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';

test/components/views/location/LocationShareMenu-test.tsx

@@ -24,7 +24,6 @@ import { M_BEACON_INFO } from 'matrix-js-sdk/src/@types/beacon';
 import { M_ASSET, LocationAssetType } from 'matrix-js-sdk/src/@types/location';
 import { logger } from 'matrix-js-sdk/src/logger';
 
-import '../../../skinned-sdk';
 import LocationShareMenu from '../../../../src/components/views/location/LocationShareMenu';
 import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
 import { ChevronFace } from '../../../../src/components/structures/ContextMenu';

test/components/views/messages/MKeyVerificationConclusion-test.js

@@ -1,4 +1,3 @@
-import '../../../skinned-sdk'; // Must be first for skinning to work
 import React from 'react';
 import TestRenderer from 'react-test-renderer';
 import { EventEmitter } from 'events';

test/components/views/right_panel/UserInfo-test.tsx

@@ -21,7 +21,6 @@ import { act } from "react-dom/test-utils";
 import { Room, User, MatrixClient } from 'matrix-js-sdk/src/matrix';
 import { Phase, VerificationRequest } from 'matrix-js-sdk/src/crypto/verification/request/VerificationRequest';
 
-import "../../../skinned-sdk";
 import UserInfo from '../../../../src/components/views/right_panel/UserInfo';
 import { RightPanelPhases } from '../../../../src/stores/right-panel/RightPanelStorePhases';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';

test/components/views/rooms/MemberList-test.tsx

@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../../../skinned-sdk";
-
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';

test/components/views/rooms/RoomHeader-test.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { Room, PendingEventOrdering, MatrixEvent, MatrixClient } from 'matrix-js-sdk/src/matrix';
 
-import "../../../skinned-sdk";
 import * as TestUtils from '../../../test-utils';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import DMRoomMap from '../../../../src/utils/DMRoomMap';

test/components/views/rooms/RoomPreviewBar-test.tsx

@@ -23,7 +23,6 @@ import {
 } from 'react-dom/test-utils';
 import { Room, RoomMember, MatrixError, IContent } from 'matrix-js-sdk/src/matrix';
 
-import "../../../skinned-sdk";
 import { stubClient } from '../../../test-utils';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import DMRoomMap from '../../../../src/utils/DMRoomMap';

test/components/views/rooms/SendMessageComposer-test.tsx

@@ -20,7 +20,6 @@ import { sleep } from "matrix-js-sdk/src/utils";
 import { MatrixClient } from "matrix-js-sdk/src/matrix";
 import { mount } from 'enzyme';
 
-import '../../../skinned-sdk'; // Must be first for skinning to work
 import SendMessageComposer, {
     createMessageContent,
     isQuickReaction,

test/components/views/settings/CryptographyPanel-test.tsx

@@ -1,5 +1,3 @@
-import '../../../skinned-sdk';
-
 import React, { ReactElement } from 'react';
 import ReactDOM from 'react-dom';
 import { MatrixClient } from 'matrix-js-sdk/src/matrix';

test/components/views/settings/FontScalingPanel-test.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import { mount } from "enzyme";
 
-import '../../../skinned-sdk';
 import * as TestUtils from "../../../test-utils";
 import FontScalingPanel from '../../../../src/components/views/settings/FontScalingPanel';
 

test/components/views/settings/Notifications-test.tsx

@@ -14,7 +14,6 @@ limitations under the License.
 
 import React from 'react';
 import { mount } from 'enzyme';
-import '../../../skinned-sdk';
 import { IPushRule, IPushRules, RuleId, IPusher } from 'matrix-js-sdk/src/matrix';
 import { IThreepid, ThreepidMedium } from 'matrix-js-sdk/src/@types/threepids';
 import { act } from 'react-dom/test-utils';

test/components/views/settings/ThemeChoicePanel-test.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import { mount } from "enzyme";
 
-import '../../../skinned-sdk';
 import * as TestUtils from "../../../test-utils";
 import ThemeChoicePanel from '../../../../src/components/views/settings/ThemeChoicePanel';
 

test/components/views/spaces/QuickThemeSwitcher-test.tsx

@@ -19,7 +19,6 @@ import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 import { act } from 'react-dom/test-utils';
 
-import '../../../skinned-sdk';
 import QuickThemeSwitcher from '../../../../src/components/views/spaces/QuickThemeSwitcher';
 import { getOrderedThemes } from '../../../../src/theme';
 import ThemeChoicePanel from '../../../../src/components/views/settings/ThemeChoicePanel';

test/components/views/spaces/SpacePanel-test.tsx

@@ -20,7 +20,6 @@ import { mocked } from 'jest-mock';
 import { MatrixClient } from 'matrix-js-sdk/src/matrix';
 import { act } from "react-dom/test-utils";
 
-import '../../../skinned-sdk';
 import SpacePanel from '../../../../src/components/views/spaces/SpacePanel';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { SpaceKey } from '../../../../src/stores/spaces';

test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx

@@ -1,5 +1,3 @@
-// skinned-sdk should be the first import in most tests
-import '../../../skinned-sdk';
 import React from "react";
 import { mocked } from 'jest-mock';
 import {

test/createRoom-test.js

@@ -1,4 +1,3 @@
-import './skinned-sdk'; // Must be first for skinning to work
 import { EventEmitter } from 'events';
 
 import { waitForMember, canEncryptToAllUsers } from '../src/createRoom';

test/editor/caret-test.js

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import { getLineAndNodePosition } from "../../src/editor/caret";
 import EditorModel from "../../src/editor/model";
 import { createPartCreator } from "./mock";

test/editor/deserialize-test.js

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import '../skinned-sdk'; // Must be first for skinning to work
 import { parseEvent } from "../../src/editor/deserialize";
 import { createPartCreator } from "./mock";
 

test/editor/model-test.js

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator, createRenderer } from "./mock";
 

test/editor/operations-test.js

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator, createRenderer } from "./mock";
 import {

test/editor/position-test.js

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator } from "./mock";
 

test/editor/range-test.js

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator, createRenderer } from "./mock";