diff --git a/.eslintrc.js b/.eslintrc.js index f5ffe63c4e..1117018f00 100644 --- a/.eslintrc.js +++ b/.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'], }; diff --git a/rtl-spec/components/commands-address-bar.spec.tsx b/tests/renderer/components/commands-address-bar.spec.tsx similarity index 91% rename from rtl-spec/components/commands-address-bar.spec.tsx rename to tests/renderer/components/commands-address-bar.spec.tsx index 66194f9817..21088efbfb 100644 --- a/rtl-spec/components/commands-address-bar.spec.tsx +++ b/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; diff --git a/rtl-spec/components/commands-bisect.spec.tsx b/tests/renderer/components/commands-bisect.spec.tsx similarity index 93% rename from rtl-spec/components/commands-bisect.spec.tsx rename to tests/renderer/components/commands-bisect.spec.tsx index ee5a53f89f..59e6d32682 100644 --- a/rtl-spec/components/commands-bisect.spec.tsx +++ b/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; diff --git a/rtl-spec/components/commands-publish-button.spec.tsx b/tests/renderer/components/commands-publish-button.spec.tsx similarity index 96% rename from rtl-spec/components/commands-publish-button.spec.tsx rename to tests/renderer/components/commands-publish-button.spec.tsx index 619f501d72..d244acedc9 100644 --- a/rtl-spec/components/commands-publish-button.spec.tsx +++ b/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; diff --git a/rtl-spec/components/commands-runner.spec.tsx b/tests/renderer/components/commands-runner.spec.tsx similarity index 90% rename from rtl-spec/components/commands-runner.spec.tsx rename to tests/renderer/components/commands-runner.spec.tsx index 6760635507..992413f025 100644 --- a/rtl-spec/components/commands-runner.spec.tsx +++ b/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; diff --git a/tests/renderer/components/commands-spec.tsx b/tests/renderer/components/commands-spec.tsx index f485a90eca..80647ed02e 100644 --- a/tests/renderer/components/commands-spec.tsx +++ b/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', diff --git a/rtl-spec/components/commands-version-chooser.spec.tsx b/tests/renderer/components/commands-version-chooser.spec.tsx similarity index 80% rename from rtl-spec/components/commands-version-chooser.spec.tsx rename to tests/renderer/components/commands-version-chooser.spec.tsx index fc6a3367e0..424536add0 100644 --- a/rtl-spec/components/commands-version-chooser.spec.tsx +++ b/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; diff --git a/tests/renderer/components/dialog-add-theme-spec.tsx b/tests/renderer/components/dialog-add-theme-spec.tsx index 3d99959ee7..f67ad4b5de 100644 --- a/tests/renderer/components/dialog-add-theme-spec.tsx +++ b/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; diff --git a/tests/renderer/components/dialog-add-version-spec.tsx b/tests/renderer/components/dialog-add-version-spec.tsx index 82a51ab0c4..ddb1c57073 100644 --- a/tests/renderer/components/dialog-add-version-spec.tsx +++ b/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; diff --git a/tests/renderer/components/dialog-bisect-spec.tsx b/tests/renderer/components/dialog-bisect-spec.tsx index af416ed074..df4bf7c697 100644 --- a/tests/renderer/components/dialog-bisect-spec.tsx +++ b/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'); diff --git a/tests/renderer/components/dialog-token-spec.tsx b/tests/renderer/components/dialog-token-spec.tsx index 2a91815730..7c5011716c 100644 --- a/tests/renderer/components/dialog-token-spec.tsx +++ b/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'); diff --git a/rtl-spec/components/editor.spec.tsx b/tests/renderer/components/editor.spec.tsx similarity index 90% rename from rtl-spec/components/editor.spec.tsx rename to tests/renderer/components/editor.spec.tsx index 5c8c357418..882cec0919 100644 --- a/rtl-spec/components/editor.spec.tsx +++ b/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; diff --git a/rtl-spec/components/editors-non-ideal-state.spec.tsx b/tests/renderer/components/editors-non-ideal-state.spec.tsx similarity index 84% rename from rtl-spec/components/editors-non-ideal-state.spec.tsx rename to tests/renderer/components/editors-non-ideal-state.spec.tsx index 650a121617..3494820e34 100644 --- a/rtl-spec/components/editors-non-ideal-state.spec.tsx +++ b/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; diff --git a/rtl-spec/components/editors-toolbar-button.spec.tsx b/tests/renderer/components/editors-toolbar-button.spec.tsx similarity index 90% rename from rtl-spec/components/editors-toolbar-button.spec.tsx rename to tests/renderer/components/editors-toolbar-button.spec.tsx index 14bd2222c2..e4ced417fe 100644 --- a/rtl-spec/components/editors-toolbar-button.spec.tsx +++ b/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; diff --git a/rtl-spec/components/editors.spec.tsx b/tests/renderer/components/editors.spec.tsx similarity index 94% rename from rtl-spec/components/editors.spec.tsx rename to tests/renderer/components/editors.spec.tsx index 5cc4f3735a..0c3bd1c85f 100644 --- a/rtl-spec/components/editors.spec.tsx +++ b/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', })); diff --git a/rtl-spec/components/history.spec.tsx b/tests/renderer/components/history.spec.tsx similarity index 90% rename from rtl-spec/components/history.spec.tsx rename to tests/renderer/components/history.spec.tsx index c06c258432..737a991b7c 100644 --- a/rtl-spec/components/history.spec.tsx +++ b/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> = {}) { + function renderDialog( + props: Partial> = {}, + ) { return render( diff --git a/tests/renderer/components/settings-credits-spec.tsx b/tests/renderer/components/settings-credits-spec.tsx index ee06aa82ef..969283d0ce 100644 --- a/tests/renderer/components/settings-credits-spec.tsx +++ b/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 = [ diff --git a/tests/renderer/components/settings-electron-spec.tsx b/tests/renderer/components/settings-electron-spec.tsx index e2fb05ec25..f4a5f0572f 100644 --- a/tests/renderer/components/settings-electron-spec.tsx +++ b/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'); diff --git a/tests/renderer/components/settings-execution-spec.tsx b/tests/renderer/components/settings-execution-spec.tsx index 8f58bdd36c..425ff65d47 100644 --- a/tests/renderer/components/settings-execution-spec.tsx +++ b/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; diff --git a/tests/renderer/components/settings-general-appearance-spec.tsx b/tests/renderer/components/settings-general-appearance-spec.tsx index 0865085327..93c81a3b30 100644 --- a/tests/renderer/components/settings-general-appearance-spec.tsx +++ b/tests/renderer/components/settings-general-appearance-spec.tsx @@ -5,7 +5,6 @@ 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, @@ -13,6 +12,7 @@ import { } 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 = [ { diff --git a/tests/renderer/components/settings-spec.tsx b/tests/renderer/components/settings-spec.tsx index 7d4808857a..27389f05f5 100644 --- a/tests/renderer/components/settings-spec.tsx +++ b/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: () =>
, diff --git a/rtl-spec/components/sidebar-file-tree.spec.tsx b/tests/renderer/components/sidebar-file-tree.spec.tsx similarity index 96% rename from rtl-spec/components/sidebar-file-tree.spec.tsx rename to tests/renderer/components/sidebar-file-tree.spec.tsx index 922df2eb12..ceefc49293 100644 --- a/rtl-spec/components/sidebar-file-tree.spec.tsx +++ b/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; diff --git a/tests/renderer/components/sidebar-package-manager-spec.tsx b/tests/renderer/components/sidebar-package-manager-spec.tsx index a49ac7adc3..1c953af36b 100644 --- a/tests/renderer/components/sidebar-package-manager-spec.tsx +++ b/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: { diff --git a/rtl-spec/components/tour-welcome.spec.tsx b/tests/renderer/components/tour-welcome.spec.tsx similarity index 95% rename from rtl-spec/components/tour-welcome.spec.tsx rename to tests/renderer/components/tour-welcome.spec.tsx index cfa226a4b5..b8a7a1e9ef 100644 --- a/rtl-spec/components/tour-welcome.spec.tsx +++ b/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; diff --git a/rtl-spec/components/tour.spec.tsx b/tests/renderer/components/tour.spec.tsx similarity index 95% rename from rtl-spec/components/tour.spec.tsx rename to tests/renderer/components/tour.spec.tsx index dd458f4016..a8088221bc 100644 --- a/rtl-spec/components/tour.spec.tsx +++ b/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; diff --git a/rtl-spec/components/version-select.spec.tsx b/tests/renderer/components/version-select.spec.tsx similarity index 95% rename from rtl-spec/components/version-select.spec.tsx rename to tests/renderer/components/version-select.spec.tsx index 85875e4b32..4e8779042a 100644 --- a/rtl-spec/components/version-select.spec.tsx +++ b/tests/renderer/components/version-select.spec.tsx @@ -8,21 +8,21 @@ import { InstallState, RunnableVersion, VersionSource, -} from '../../src/interfaces'; +} from '../../../src/interfaces'; import { VersionSelect, filterItems, getItemIcon, getItemLabel, renderItem, -} from '../../src/renderer/components/version-select'; -import { disableDownload } from '../../src/renderer/utils/disable-download'; -import { mockVersion1, prepareAppState } from '../test-utils/versions'; +} from '../../../src/renderer/components/version-select'; +import { disableDownload } from '../../../src/renderer/utils/disable-download'; +import { mockVersion1, prepareAppState } from '../utils/versions'; const { downloading, installed, missing, installing } = InstallState; const { local } = VersionSource; -vi.mock('../../src/renderer/utils/disable-download.ts'); +vi.mock('../../../src/renderer/utils/disable-download.ts'); describe('VersionSelect component', () => { function renderVersionSelect() { diff --git a/rtl-spec/test-utils/renderClassComponentWithInstanceRef.ts b/tests/renderer/utils/renderClassComponentWithInstanceRef.ts similarity index 100% rename from rtl-spec/test-utils/renderClassComponentWithInstanceRef.ts rename to tests/renderer/utils/renderClassComponentWithInstanceRef.ts diff --git a/rtl-spec/test-utils/versions.ts b/tests/renderer/utils/versions.ts similarity index 84% rename from rtl-spec/test-utils/versions.ts rename to tests/renderer/utils/versions.ts index 61a7cd70a0..2aa6984547 100644 --- a/rtl-spec/test-utils/versions.ts +++ b/tests/renderer/utils/versions.ts @@ -2,9 +2,9 @@ import { ElectronReleaseChannel, InstallState, VersionSource, -} from '../../src/interfaces'; -import { VersionsMock } from '../../tests/mocks/electron-versions'; -import { StateMock } from '../../tests/mocks/state'; +} from '../../../src/interfaces'; +import { VersionsMock } from '../../mocks/electron-versions'; +import { StateMock } from '../../mocks/state'; const { missing } = InstallState; const { remote } = VersionSource; diff --git a/tsconfig.json b/tsconfig.json index ffc7184884..d199902dde 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,6 +21,6 @@ "typeRoots": ["./node_modules/@types"], "baseUrl": "." }, - "include": ["rtl-spec/**/*", "src/**/*", "tests/**/*"], + "include": ["src/**/*", "tests/**/*"], "exclude": ["node_modules/**/*"] } diff --git a/vitest.config.ts b/vitest.config.ts index 0adb524a7f..02c034b6d8 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -4,7 +4,7 @@ export default defineConfig({ test: { environment: 'jsdom', globalSetup: 'tests/globalSetup.ts', - include: ['**/rtl-spec/**/*.spec.{ts,tsx}', '**/tests/**/*-spec.{ts,tsx}'], + include: ['**/tests/**/*{-,.}spec.{ts,tsx}'], setupFiles: ['tests/setup.ts'], }, });