Move test.utils.ts to test/ folder

BuZZ-T · Nov 5, 2021 · 77ca14c · 77ca14c
1 parent dedaa5a
commit 77ca14c
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 25 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,4 +1,3 @@
 *.ts
 localstore.json
-test.utils.js
-test.utils.js.map
+test/
diff --git a/config/config.spec.ts b/config/config.spec.ts
@@ -11,7 +11,7 @@ import { ComparableVersion } from '../commons/ComparableVersion'
 import { IChromeConfigWrapper, IStoreConfigWrapper, IExportConfigWrapper } from '../interfaces/interfaces'
 import { OS } from '../interfaces/os.interfaces'
 import { Spinner, logger } from '../log/spinner'
-import { createChromeConfig, createChromeOptions } from '../test.utils'
+import { createChromeConfig, createChromeOptions } from '../test/test.utils'
 import { DEFAULT_OPTIONS, readConfig } from './config'
 
 /* eslint-disable-next-line @typescript-eslint/no-var-requires */

diff --git a/download.spec.ts b/download.spec.ts
@@ -18,6 +18,7 @@ import { logger } from './log/spinner'
 import { loadStore } from './store/loadStore'
 import { Store } from './store/Store'
 import { createChromeConfig, createStore, createDownloadSettings, MkdirWithOptions, StatsWithoutOptions } from './test.utils'
+import { createChromeConfig, createStore, createDownloadSettings, MkdirWithOptions, StatsWithoutOptions } from './test/test.utils'
 import { getChromeDownloadUrl, loadVersions, mapVersions } from './versions'
 
 /* eslint-disable-next-line @typescript-eslint/no-var-requires */

diff --git a/jest.config.js b/jest.config.js
@@ -9,6 +9,5 @@ module.exports = {
     "!<rootDir>/start-local.ts",
     "!public_api.ts",
     "!<rootDir>/test/*",
-    "!test.utils.ts",
   ],
 }
diff --git a/log/printer.spec.ts b/log/printer.spec.ts
@@ -6,7 +6,7 @@
 
 import { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 
-import { PartialStdio } from '../test.utils'
+import { PartialStdio } from '../test/test.utils'
 import { Printer } from './printer'
 
 jest.mock('chalk', () => ({

diff --git a/log/progress.spec.ts b/log/progress.spec.ts
@@ -6,7 +6,7 @@
 
 import { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 
-import { PartialStdio } from '../test.utils'
+import { PartialStdio } from '../test/test.utils'
 import { ProgressBar } from './progress'
 
 jest.mock('chalk', () => ({

diff --git a/log/spinner.spec.ts b/log/spinner.spec.ts
@@ -8,7 +8,7 @@ import * as chalk from 'chalk'
 import { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
-import { PartialStdio } from '../test.utils'
+import { PartialStdio } from '../test/test.utils'
 import { Spinner } from './spinner'
 
 jest.mock('chalk', () => ({

diff --git a/rusted.int.spec.ts b/rusted.int.spec.ts
@@ -9,8 +9,8 @@ import * as mockFs from 'mock-fs'
 import * as path from 'path'
 
 import { downloadChromium } from './download'
-import { createStore, createChromeConfig } from './test.utils'
 import { mockAllFetches } from './test/int.utils'
+import { createStore, createChromeConfig } from './test/test.utils'
 
 jest.mock('./api')
 

diff --git a/rusted.spec.ts b/rusted.spec.ts
@@ -14,7 +14,7 @@ import { logger } from './log/spinner'
 import { rusted } from './rusted'
 import { exportStore } from './store/exportStore'
 import { importAndMergeLocalstore } from './store/importStore'
-import { createChromeConfig } from './test.utils'
+import { createChromeConfig } from './test/test.utils'
 
 jest.mock('./download')
 jest.mock('./config/config')

diff --git a/select.spec.ts b/select.spec.ts
@@ -9,7 +9,7 @@ import { mocked } from 'ts-jest/utils'
 
 import { MappedVersion } from './commons/MappedVersion'
 import { userSelectedVersion } from './select'
-import { createChromeConfig } from './test.utils'
+import { createChromeConfig } from './test/test.utils'
 
 /* eslint-disable-next-line @typescript-eslint/no-var-requires */
 const prompts = require('prompts')

diff --git a/store/downloadStore.spec.ts b/store/downloadStore.spec.ts
@@ -10,7 +10,7 @@ import { mocked } from 'ts-jest/utils'
 import { fetchLocalStore } from '../api'
 import { LOAD_CONFIG } from '../commons/constants'
 import { logger, Spinner } from '../log/spinner'
-import { createStore } from '../test.utils'
+import { createStore } from '../test/test.utils'
 import { downloadStore } from './downloadStore'
 import { Store } from './Store'
 

diff --git a/store/importStore.spec.ts b/store/importStore.spec.ts
@@ -11,7 +11,7 @@ import { mocked } from 'ts-jest/utils'
 
 import { LOCAL_STORE_FILE } from '../commons/constants'
 import { IStoreConfig } from '../interfaces/interfaces'
-import { createStore, ReadFileWithOptions } from '../test.utils'
+import { createStore, ReadFileWithOptions } from '../test/test.utils'
 import { downloadStore } from './downloadStore'
 import { importAndMergeLocalstore } from './importStore'
 import { readStoreFile } from './readStore'

diff --git a/store/readStore.spec.ts b/store/readStore.spec.ts
@@ -10,7 +10,7 @@ import { mocked } from 'ts-jest/utils'
 
 import { IStoreConfig } from '../interfaces/interfaces'
 import { Spinner, logger } from '../log/spinner'
-import { createStore, ReadFileWithOptions } from '../test.utils'
+import { createStore, ReadFileWithOptions } from '../test/test.utils'
 import { readStoreFile } from './readStore'
 import { Store } from './Store'
 

diff --git a/store/store.spec.ts b/store/store.spec.ts
@@ -11,7 +11,7 @@ import { mocked } from 'ts-jest/utils'
 
 import { ComparableVersion } from '../commons/ComparableVersion'
 import { Store } from '../interfaces/interfaces'
-import { createStore, ReadFileWithOptions } from '../test.utils'
+import { createStore, ReadFileWithOptions } from '../test/test.utils'
 import store from './store'
 
 jest.mock('fs')

diff --git a/test/int.utils.ts b/test/int.utils.ts
@@ -3,7 +3,7 @@ import { PassThrough } from 'stream'
 import { mocked } from 'ts-jest/utils'
 
 import { fetchBranchPosition, fetchChromeUrl, fetchChromeZipFile, fetchChromiumTags, fetchLocalStore } from '../api'
-import { createStore } from '../test.utils'
+import { createStore } from '../test/test.utils'
 
 export function mockAllFetches(): void {
     mocked(fetchLocalStore).mockResolvedValue(JSON.stringify(createStore()))

diff --git a/test.utils.ts → test/test.utils.ts b/test.utils.ts → test/test.utils.ts
@@ -1,11 +1,11 @@
 import { NoParamCallback, PathLike, Stats } from 'fs'
 import { HTMLElement as NodeParserHTMLElement, Node as NodeParserNode } from 'node-html-parser'
 
-import { ComparableVersion } from './commons/ComparableVersion'
-import { DEFAULT_OPTIONS } from './config/config'
-import { IConfigOptions } from './interfaces/config.interfaces'
-import { IChromeConfig, IDownloadSettings } from './interfaces/interfaces'
-import { IListStore } from './interfaces/store.interfaces'
+import { ComparableVersion } from '../commons/ComparableVersion'
+import { DEFAULT_OPTIONS } from '../config/config'
+import { IConfigOptions } from '../interfaces/config.interfaces'
+import { IChromeConfig, IDownloadSettings, Store } from '../interfaces/interfaces'
+import { IListStore } from '../interfaces/store.interfaces'
 
 export interface PartialStdio {
     write: () => boolean

diff --git a/tsconfig.json b/tsconfig.json
@@ -20,6 +20,7 @@
     "exclude": [
         "node_modules",
         "start-local.ts",
-        "**/*.spec.ts"
+        "**/*.spec.ts",
+        "test/*"
     ]
 }
diff --git a/utils.spec.ts b/utils.spec.ts
@@ -11,8 +11,10 @@ import { ComparableVersion } from './commons/ComparableVersion'
 import { MappedVersion } from './commons/MappedVersion'
 import { Compared } from './interfaces/interfaces'
 import { IOSSettings, OS } from './interfaces/os.interfaces'
-import { createChromeConfig, createStore } from './test.utils'
-import { detectOperatingSystem, sortDescendingMappedVersions, compareComparableVersions, sortAscendingMappedVersions, isTextFunction, sortStoreEntries } from './utils'
+import { logger, Spinner } from './log/spinner'
+import { createChromeConfig, createStore } from './test/test.utils'
+import { detectOperatingSystem, sortDescendingMappedVersions, compareComparableVersions, sortAscendingMappedVersions, sortStoreEntries, isTextFunction } from './utils'
+
 
 describe('utils', () => {
 

diff --git a/versions.spec.ts b/versions.spec.ts
@@ -16,8 +16,8 @@ import { OSSetting } from './interfaces/os.interfaces'
 import { Spinner, logger } from './log/spinner'
 import { userSelectedVersion } from './select'
 import { Store } from './store/Store'
-import { storeNegativeHit } from './store/storeNegativeHit'
-import { createChromeConfig, createNodeParserHTMLElement, createNodeWithChildren, createStore } from './test.utils'
+import { storeNegativeHit } from './store/store'
+import { createChromeConfig, createNodeParserHTMLElement, createNodeWithChildren } from './test/test.utils'
 import { detectOperatingSystem } from './utils'
 import { mapVersions, getChromeDownloadUrl, loadVersions } from './versions'