test: merge rtl-spec back into tests directory

.eslintrc.js

@@ -72,9 +72,7 @@ const config = {
     ],
     'tsdoc/syntax': 'error',
   },
-  overrides: [
-    { files: ['rtl-spec/**', 'tests/**'], rules: { 'tsdoc/syntax': 'off' } },
-  ],
+  overrides: [{ files: ['tests/**'], rules: { 'tsdoc/syntax': 'off' } }],
   // the static folder is linted by standard
   ignorePatterns: ['/out', '/.webpack', '/coverage', '/static'],
 };

rtl-spec/components/commands-address-bar.spec.tsx → tests/renderer/components/commands-address-bar.spec.tsx

@@ -5,9 +5,9 @@ import { userEvent } from '@testing-library/user-event';
 import { runInAction } from 'mobx';
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import { GistActionState } from '../../src/interfaces';
-import { AddressBar } from '../../src/renderer/components/commands-address-bar';
-import { AppState } from '../../src/renderer/state';
+import { GistActionState } from '../../../src/interfaces';
+import { AddressBar } from '../../../src/renderer/components/commands-address-bar';
+import { AppState } from '../../../src/renderer/state';
 
 describe('AddressBar component', () => {
   let store: AppState;

rtl-spec/components/commands-bisect.spec.tsx → tests/renderer/components/commands-bisect.spec.tsx

@@ -4,9 +4,9 @@ import { render } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { InstallState, VersionSource } from '../../src/interfaces';
-import { BisectHandler } from '../../src/renderer/components/commands-bisect';
-import { AppState } from '../../src/renderer/state';
+import { InstallState, VersionSource } from '../../../src/interfaces';
+import { BisectHandler } from '../../../src/renderer/components/commands-bisect';
+import { AppState } from '../../../src/renderer/state';
 
 describe('Bisect commands component', () => {
   let store: AppState;

rtl-spec/components/commands-publish-button.spec.tsx → tests/renderer/components/commands-publish-button.spec.tsx

@@ -7,15 +7,15 @@ import {
   GistActionState,
   GistActionType,
   MAIN_JS,
-} from '../../src/interfaces';
-import { App } from '../../src/renderer/app';
-import { GistActionButton } from '../../src/renderer/components/commands-action-button';
-import { AppState } from '../../src/renderer/state';
-import { getOctokit } from '../../src/renderer/utils/octokit';
-import { createEditorValues } from '../../tests/mocks/mocks';
-import { renderClassComponentWithInstanceRef } from '../test-utils/renderClassComponentWithInstanceRef';
-
-vi.mock('../../src/renderer/utils/octokit');
+} from '../../../src/interfaces';
+import { App } from '../../../src/renderer/app';
+import { GistActionButton } from '../../../src/renderer/components/commands-action-button';
+import { AppState } from '../../../src/renderer/state';
+import { getOctokit } from '../../../src/renderer/utils/octokit';
+import { createEditorValues } from '../../mocks/mocks';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
+
+vi.mock('../../../src/renderer/utils/octokit');
 
 class OctokitMock {
   private static nextId = 1;

rtl-spec/components/commands-runner.spec.tsx → tests/renderer/components/commands-runner.spec.tsx

@@ -1,11 +1,11 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { InstallState } from '../../src/interfaces';
-import { Runner } from '../../src/renderer/components/commands-runner';
-import { AppState } from '../../src/renderer/state';
-import { renderClassComponentWithInstanceRef } from '../test-utils/renderClassComponentWithInstanceRef';
+import { InstallState } from '../../../src/interfaces';
+import { Runner } from '../../../src/renderer/components/commands-runner';
+import { AppState } from '../../../src/renderer/state';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
-vi.mock('../../src/renderer/file-manager');
+vi.mock('../../../src/renderer/file-manager');
 
 describe('Runner component', () => {
   let store: AppState;

tests/renderer/components/commands-spec.tsx

@@ -4,10 +4,10 @@ import { render, screen } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import { Commands } from '../../../src/renderer/components/commands';
 import { AppState } from '../../../src/renderer/state';
 import { overrideRendererPlatform, resetRendererPlatform } from '../../utils';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 vi.mock('../../../src/renderer/components/commands-runner', () => ({
   Runner: 'runner',

rtl-spec/components/commands-version-chooser.spec.tsx → tests/renderer/components/commands-version-chooser.spec.tsx

@@ -4,9 +4,9 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import { VersionChooser } from '../../src/renderer/components/commands-version-chooser';
-import { AppState } from '../../src/renderer/state';
-import { mockVersion1, prepareAppState } from '../test-utils/versions';
+import { VersionChooser } from '../../../src/renderer/components/commands-version-chooser';
+import { AppState } from '../../../src/renderer/state';
+import { mockVersion1, prepareAppState } from '../utils/versions';
 
 describe('VersionSelect component', () => {
   let appState: AppState;

tests/renderer/components/dialog-add-theme-spec.tsx

@@ -3,11 +3,11 @@ import * as React from 'react';
 import { act, render, screen } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import { AddThemeDialog } from '../../../src/renderer/components/dialog-add-theme';
 import { AppState } from '../../../src/renderer/state';
 import { LoadedFiddleTheme, defaultLight } from '../../../src/themes-defaults';
 import { overrideRendererPlatform } from '../../utils';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 class FileMock extends Blob {
   public lastModified: number;

tests/renderer/components/dialog-add-version-spec.tsx

@@ -3,10 +3,10 @@ import * as React from 'react';
 import { act, fireEvent, render, screen } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import { AddVersionDialog } from '../../../src/renderer/components/dialog-add-version';
 import { AppState } from '../../../src/renderer/state';
 import { overrideRendererPlatform } from '../../utils';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 describe('AddVersionDialog component', () => {
   let store: AppState;

tests/renderer/components/dialog-bisect-spec.tsx

@@ -1,7 +1,6 @@
 import { act, screen } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import {
   ElectronReleaseChannel,
   InstallState,
@@ -13,6 +12,7 @@ import { BisectDialog } from '../../../src/renderer/components/dialog-bisect';
 import { Runner } from '../../../src/renderer/runner';
 import { AppState } from '../../../src/renderer/state';
 import { StateMock } from '../../mocks/mocks';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 vi.mock('../../../src/renderer/bisect');
 

tests/renderer/components/dialog-token-spec.tsx

@@ -4,11 +4,11 @@ import { Octokit } from '@octokit/rest';
 import { act, render, screen } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import { TokenDialog } from '../../../src/renderer/components/dialog-token';
 import { AppState } from '../../../src/renderer/state';
 import { getOctokit } from '../../../src/renderer/utils/octokit';
 import { overrideRendererPlatform } from '../../utils';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 vi.mock('../../../src/renderer/utils/octokit');
 

rtl-spec/components/editor.spec.tsx → tests/renderer/components/editor.spec.tsx

@@ -1,9 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { EditorId, MAIN_JS } from '../../src/interfaces';
-import { Editor } from '../../src/renderer/components/editor';
-import { AppState } from '../../src/renderer/state';
-import { renderClassComponentWithInstanceRef } from '../test-utils/renderClassComponentWithInstanceRef';
+import { EditorId, MAIN_JS } from '../../../src/interfaces';
+import { Editor } from '../../../src/renderer/components/editor';
+import { AppState } from '../../../src/renderer/state';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 type DidMount = () => void;
 

rtl-spec/components/editors-non-ideal-state.spec.tsx → tests/renderer/components/editors-non-ideal-state.spec.tsx

@@ -4,8 +4,8 @@ import { render } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { RenderNonIdealState } from '../../src/renderer/components/editors-non-ideal-state';
-import { EditorMosaic } from '../../src/renderer/editor-mosaic';
+import { RenderNonIdealState } from '../../../src/renderer/components/editors-non-ideal-state';
+import { EditorMosaic } from '../../../src/renderer/editor-mosaic';
 
 describe('RenderNonIdealState component', () => {
   let editorMosaic: EditorMosaic;

rtl-spec/components/editors-toolbar-button.spec.tsx → tests/renderer/components/editors-toolbar-button.spec.tsx

@@ -2,13 +2,13 @@ import { userEvent } from '@testing-library/user-event';
 import { MosaicContext, MosaicWindowContext } from 'react-mosaic-component';
 import { beforeAll, describe, expect, it, vi } from 'vitest';
 
-import { EditorId, MAIN_JS } from '../../src/interfaces';
+import { EditorId, MAIN_JS } from '../../../src/interfaces';
 import {
   MaximizeButton,
   RemoveButton,
-} from '../../src/renderer/components/editors-toolbar-button';
-import { AppState } from '../../src/renderer/state';
-import { renderClassComponentWithInstanceRef } from '../test-utils/renderClassComponentWithInstanceRef';
+} from '../../../src/renderer/components/editors-toolbar-button';
+import { AppState } from '../../../src/renderer/state';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 let mockContext = {} as MosaicWindowContext & MosaicContext<string>;
 

rtl-spec/components/editors.spec.tsx → tests/renderer/components/editors.spec.tsx

@@ -2,20 +2,20 @@
 import { MosaicNode } from 'react-mosaic-component';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { EditorId, EditorValues, MAIN_JS } from '../../src/interfaces';
-import { App } from '../../src/renderer/app';
-import { Editors } from '../../src/renderer/components/editors';
-import { Editor, EditorMosaic } from '../../src/renderer/editor-mosaic';
-import { AppState } from '../../src/renderer/state';
+import { EditorId, EditorValues, MAIN_JS } from '../../../src/interfaces';
+import { App } from '../../../src/renderer/app';
+import { Editors } from '../../../src/renderer/components/editors';
+import { Editor, EditorMosaic } from '../../../src/renderer/editor-mosaic';
+import { AppState } from '../../../src/renderer/state';
 import {
   MonacoEditorMock,
   StateMock,
   createEditorValues,
-} from '../../tests/mocks/mocks';
-import { emitEvent } from '../../tests/utils';
-import { renderClassComponentWithInstanceRef } from '../test-utils/renderClassComponentWithInstanceRef';
+} from '../../mocks/mocks';
+import { emitEvent } from '../../utils';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
-vi.mock('../../src/renderer/components/editor', () => ({
+vi.mock('../../../src/renderer/components/editor', () => ({
   Editor: () => 'EditorComponent',
 }));
 

rtl-spec/components/history.spec.tsx → tests/renderer/components/history.spec.tsx

@@ -4,13 +4,13 @@ import { Octokit } from '@octokit/rest';
 import { render, screen, waitFor } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { GistRevision } from '../../src/interfaces';
-import { App } from '../../src/renderer/app';
-import { GistHistoryDialog } from '../../src/renderer/components/history';
-import { AppState } from '../../src/renderer/state';
-import { getOctokit } from '../../src/renderer/utils/octokit';
+import { GistRevision } from '../../../src/interfaces';
+import { App } from '../../../src/renderer/app';
+import { GistHistoryDialog } from '../../../src/renderer/components/history';
+import { AppState } from '../../../src/renderer/state';
+import { getOctokit } from '../../../src/renderer/utils/octokit';
 
-vi.mock('../../src/renderer/utils/octokit');
+vi.mock('../../../src/renderer/utils/octokit');
 
 describe('GistHistoryDialog component', () => {
   let app: App;
@@ -49,7 +49,9 @@ describe('GistHistoryDialog component', () => {
     vi.mocked(getOctokit).mockResolvedValue({} as unknown as Octokit);
   });
 
-  function renderDialog(props: Partial<React.ComponentProps<typeof GistHistoryDialog>> = {}) {
+  function renderDialog(
+    props: Partial<React.ComponentProps<typeof GistHistoryDialog>> = {},
+  ) {
     return render(
       <GistHistoryDialog
         appState={state}

tests/renderer/components/output-spec.tsx

@@ -2,11 +2,11 @@ import type * as MonacoType from 'monaco-editor';
 import type { MosaicContext } from 'react-mosaic-component';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import { Output } from '../../../src/renderer/components/output';
 import { WrapperEditorId } from '../../../src/renderer/components/output-editors-wrapper';
 import { AppState } from '../../../src/renderer/state';
 import { MonacoMock } from '../../mocks/mocks';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 const mockContext = vi.hoisted(
   () =>

tests/renderer/components/settings-credits-spec.tsx

@@ -2,9 +2,9 @@ import { act, screen } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import { CreditsSettings } from '../../../src/renderer/components/settings-credits';
 import { AppState } from '../../../src/renderer/state';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 describe('CreditsSettings component', () => {
   const mockContributors = [

tests/renderer/components/settings-electron-spec.tsx

@@ -5,7 +5,6 @@ import { userEvent } from '@testing-library/user-event';
 import { runInAction } from 'mobx';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import {
   ElectronReleaseChannel,
   InstallState,
@@ -16,6 +15,7 @@ import { ElectronSettings } from '../../../src/renderer/components/settings-elec
 import { AppState } from '../../../src/renderer/state';
 import { disableDownload } from '../../../src/renderer/utils/disable-download';
 import { AppMock, StateMock, VersionsMock } from '../../mocks/mocks';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 vi.mock('../../../src/renderer/utils/disable-download.ts');
 

tests/renderer/components/settings-execution-spec.tsx

@@ -4,12 +4,12 @@ import { act, render, screen } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import {
   ExecutionSettings,
   SettingItemType,
 } from '../../../src/renderer/components/settings-execution';
 import { AppState } from '../../../src/renderer/state';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 describe('ExecutionSettings component', () => {
   let store: AppState;

tests/renderer/components/settings-general-appearance-spec.tsx

@@ -5,14 +5,14 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import {
   AppearanceSettings,
   filterItem,
   renderItem,
 } from '../../../src/renderer/components/settings-general-appearance';
 import { AppState } from '../../../src/renderer/state';
 import { FiddleTheme, LoadedFiddleTheme } from '../../../src/themes-defaults';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 const mockThemes = [
   {

tests/renderer/components/settings-spec.tsx

@@ -4,9 +4,9 @@ import { act, render, screen } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import { Settings } from '../../../src/renderer/components/settings';
 import { AppState } from '../../../src/renderer/state';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 vi.mock('../../../src/renderer/components/settings-general', () => ({
   GeneralSettings: () => <div data-testid="settings-general" />,

rtl-spec/components/sidebar-file-tree.spec.tsx → tests/renderer/components/sidebar-file-tree.spec.tsx

@@ -9,13 +9,16 @@ import {
   MAIN_CJS,
   MAIN_JS,
   PACKAGE_NAME,
-} from '../../src/interfaces';
-import { Editors } from '../../src/renderer/components/editors';
-import { SidebarFileTree } from '../../src/renderer/components/sidebar-file-tree';
-import { EditorMosaic, EditorPresence } from '../../src/renderer/editor-mosaic';
-import { AppState } from '../../src/renderer/state';
-import { createEditorValues } from '../../tests/mocks/editor-values';
-import { AppMock, StateMock } from '../../tests/mocks/mocks';
+} from '../../../src/interfaces';
+import { Editors } from '../../../src/renderer/components/editors';
+import { SidebarFileTree } from '../../../src/renderer/components/sidebar-file-tree';
+import {
+  EditorMosaic,
+  EditorPresence,
+} from '../../../src/renderer/editor-mosaic';
+import { AppState } from '../../../src/renderer/state';
+import { createEditorValues } from '../../../tests/mocks/editor-values';
+import { AppMock, StateMock } from '../../../tests/mocks/mocks';
 
 describe('SidebarFileTree component', () => {
   let store: AppState;

tests/renderer/components/sidebar-package-manager-spec.tsx

@@ -4,9 +4,9 @@ import { render, screen } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { renderClassComponentWithInstanceRef } from '../../../rtl-spec/test-utils/renderClassComponentWithInstanceRef';
 import { SidebarPackageManager } from '../../../src/renderer/components/sidebar-package-manager';
 import { AppState } from '../../../src/renderer/state';
+import { renderClassComponentWithInstanceRef } from '../utils/renderClassComponentWithInstanceRef';
 
 vi.mock('../../../src/renderer/npm-search', () => ({
   npmSearch: {

rtl-spec/components/tour-welcome.spec.tsx → tests/renderer/components/tour-welcome.spec.tsx

@@ -7,8 +7,8 @@ import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import {
   WelcomeTour,
   getWelcomeTour,
-} from '../../src/renderer/components/tour-welcome';
-import { AppState } from '../../src/renderer/state';
+} from '../../../src/renderer/components/tour-welcome';
+import { AppState } from '../../../src/renderer/state';
 
 describe('Header component', () => {
   let appState: AppState;

rtl-spec/components/tour.spec.tsx → tests/renderer/components/tour.spec.tsx

@@ -4,8 +4,8 @@ import { render } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { Tour, TourScriptStep } from '../../src/renderer/components/tour';
-import { overrideRendererPlatform } from '../../tests/utils';
+import { Tour, TourScriptStep } from '../../../src/renderer/components/tour';
+import { overrideRendererPlatform } from '../../../tests/utils';
 
 describe('Tour component', () => {
   const oldQuerySelector = document.querySelector;