Move spec/public/* to src/*

scottohara · Aug 25, 2023 · 4b7f5b1 · 4b7f5b1
1 parent 6d178ad
commit 4b7f5b1
Show file tree

Hide file tree

Showing 58 changed files with 41 additions and 44 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -9,7 +9,7 @@
 		{
 			"files": [
 				"**/*.test.ts",
-				"**/*-mock.ts"
+				"**/mocks/**/*"
 			],
 			"env": {
 				"mocha": true

diff --git a/karma-bdd.conf.js b/karma-bdd.conf.js
@@ -8,7 +8,7 @@ module.exports = config => {
 		 * available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
 		 */
 		preprocessors: {
-			"spec/public/**/*.test.ts": ["webpack", "sourcemap"]
+			"src/**/*.test.ts": ["webpack", "sourcemap"]
 		},
 
 		/*

diff --git a/karma.common.js b/karma.common.js
@@ -15,7 +15,7 @@ module.exports = {
 
 	// List of files / patterns to load in the browser
 	files: [
-		"spec/public/**/*.test.ts",
+		"src/**/*.test.ts",
 		{
 			pattern: `${outputPath}/**/*`,
 			watched: false,

diff --git a/karma.conf.js b/karma.conf.js
@@ -8,7 +8,7 @@ module.exports = config => {
 		 * available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
 		 */
 		preprocessors: {
-			"spec/public/**/*.test.ts": "webpack"
+			"src/**/*.test.ts": "webpack"
 		},
 
 		/*

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "css-loader": "6.4.0",
     "cypress": "12.17.2",
     "eslint": "8.46.0",
-    "eslint-config-oharagroup": "3.11.0",
+    "eslint-config-oharagroup": "3.12.0",
     "html-loader": "2.1.2",
     "html-webpack-plugin": "5.4.0",
     "ignore-loader": "0.1.2",
@@ -82,7 +82,7 @@
     "show:simulator": "npm run start:simulator && open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app",
     "build": "webpack --progress --config webpack.prod.js",
     "dev": "webpack serve --config webpack.dev.js",
-    "lint": "eslint 'src/**/*.{ts,js}' 'spec/public/**/*.{ts,js}' 'cypress/**/*.{ts,js}' '*.{ts,js}'",
+    "lint": "eslint 'src/**/*.{ts,js}' 'cypress/**/*.{ts,js}' '*.{ts,js}'",
     "cypress": "cypress open --e2e --browser chrome",
     "test": "npm run lint && npm run test:coverage:mobile",
     "test:bdd": "karma start karma-bdd.conf.js",

diff --git a/spec/public/components/list.test.ts → src/components/list.test.ts b/spec/public/components/list.test.ts → src/components/list.test.ts
@@ -3,7 +3,7 @@ import type {
 	ListItem
 } from "~/components";
 import ApplicationControllerMock from "~/mocks/application-controller-mock";
-import List from "../../../src/components/list";
+import List from "./list";
 import ListTemplate from "~/views/listTemplate.html";
 import type { SinonStub } from "sinon";
 import TestController from "~/mocks/test-controller";

diff --git a/spec/public/components/progressbar.test.ts → src/components/progressbar.test.ts b/spec/public/components/progressbar.test.ts → src/components/progressbar.test.ts
@@ -1,4 +1,4 @@
-import ProgressBar from "../../../src/components/progressbar";
+import ProgressBar from "./progressbar";
 import type { Section } from "~/components";
 
 describe("ProgressBar", (): void => {

diff --git a/...blic/controllers/about-controller.test.ts → src/controllers/about-controller.test.ts b/...blic/controllers/about-controller.test.ts → src/controllers/about-controller.test.ts
@@ -2,7 +2,7 @@ import type {
 	NavButton,
 	NavButtonEventHandler
 } from "~/controllers";
-import AboutController from "../../../src/controllers/about-controller";
+import AboutController from "~/controllers/about-controller";
 import AboutView from "~/views/about-view.html";
 import ApplicationControllerMock from "~/mocks/application-controller-mock";
 import EpisodeMock from "~/mocks/episode-model-mock";

diff --git a/...ontrollers/application-controller.test.ts → ...ontrollers/application-controller.test.ts b/...ontrollers/application-controller.test.ts → ...ontrollers/application-controller.test.ts
@@ -11,7 +11,7 @@ import type {
 	SinonSpy,
 	SinonStub
 } from "sinon";
-import ApplicationController from "../../../src/controllers/application-controller";
+import ApplicationController from "./application-controller";
 import SettingMock from "~/mocks/setting-model-mock";
 import SyncMock from "~/mocks/sync-model-mock";
 import TestController from "~/mocks/test-controller";

diff --git a/...c/controllers/dataSync-controller.test.ts → src/controllers/dataSync-controller.test.ts b/...c/controllers/dataSync-controller.test.ts → src/controllers/dataSync-controller.test.ts
diff --git a/...ic/controllers/episode-controller.test.ts → src/controllers/episode-controller.test.ts b/...ic/controllers/episode-controller.test.ts → src/controllers/episode-controller.test.ts
diff --git a/...c/controllers/episodes-controller.test.ts → src/controllers/episodes-controller.test.ts b/...c/controllers/episodes-controller.test.ts → src/controllers/episodes-controller.test.ts
diff --git a/...ic/controllers/program-controller.test.ts → src/controllers/program-controller.test.ts b/...ic/controllers/program-controller.test.ts → src/controllers/program-controller.test.ts
diff --git a/...c/controllers/programs-controller.test.ts → src/controllers/programs-controller.test.ts b/...c/controllers/programs-controller.test.ts → src/controllers/programs-controller.test.ts
diff --git a/...ntrollers/registration-controller.test.ts → ...ntrollers/registration-controller.test.ts b/...ntrollers/registration-controller.test.ts → ...ntrollers/registration-controller.test.ts
diff --git a/...lic/controllers/report-controller.test.ts → src/controllers/report-controller.test.ts b/...lic/controllers/report-controller.test.ts → src/controllers/report-controller.test.ts
diff --git a/...c/controllers/schedule-controller.test.ts → src/controllers/schedule-controller.test.ts b/...c/controllers/schedule-controller.test.ts → src/controllers/schedule-controller.test.ts
diff --git a/...lic/controllers/series-controller.test.ts → src/controllers/series-controller.test.ts b/...lic/controllers/series-controller.test.ts → src/controllers/series-controller.test.ts
diff --git a/...controllers/seriesList-controller.test.ts → ...controllers/seriesList-controller.test.ts b/...controllers/seriesList-controller.test.ts → ...controllers/seriesList-controller.test.ts
diff --git a/...c/controllers/settings-controller.test.ts → src/controllers/settings-controller.test.ts b/...c/controllers/settings-controller.test.ts → src/controllers/settings-controller.test.ts
diff --git a/...ontrollers/unscheduled-controller.test.ts → ...ontrollers/unscheduled-controller.test.ts b/...ontrollers/unscheduled-controller.test.ts → ...ontrollers/unscheduled-controller.test.ts
diff --git a/...blic/mocks/application-controller-mock.ts → src/mocks/application-controller-mock.ts b/...blic/mocks/application-controller-mock.ts → src/mocks/application-controller-mock.ts
diff --git a/spec/public/mocks/comlink-mock.ts → src/mocks/comlink-mock.ts b/spec/public/mocks/comlink-mock.ts → src/mocks/comlink-mock.ts
@@ -2,7 +2,7 @@ import {
 	type Remote,
 	expose as originalExpose,
 	wrap as originalWrap
-} from "../../../node_modules/comlink";
+} from "../../node_modules/comlink";
 import type { SinonSpy } from "sinon";
 import sinon from "sinon";
 

diff --git a/spec/public/mocks/database-service-mock.ts → src/mocks/database-service-mock.ts b/spec/public/mocks/database-service-mock.ts → src/mocks/database-service-mock.ts
diff --git a/spec/public/mocks/db-store-mock.ts → src/mocks/db-store-mock.ts b/spec/public/mocks/db-store-mock.ts → src/mocks/db-store-mock.ts
diff --git a/spec/public/mocks/episode-model-mock.ts → src/mocks/episode-model-mock.ts b/spec/public/mocks/episode-model-mock.ts → src/mocks/episode-model-mock.ts
diff --git a/spec/public/mocks/episodes-store-mock.ts → src/mocks/episodes-store-mock.ts b/spec/public/mocks/episodes-store-mock.ts → src/mocks/episodes-store-mock.ts
diff --git a/spec/public/mocks/list-mock.ts → src/mocks/list-mock.ts b/spec/public/mocks/list-mock.ts → src/mocks/list-mock.ts
diff --git a/spec/public/mocks/md5-mock.ts → src/mocks/md5-mock.ts b/spec/public/mocks/md5-mock.ts → src/mocks/md5-mock.ts
diff --git a/spec/public/mocks/program-model-mock.ts → src/mocks/program-model-mock.ts b/spec/public/mocks/program-model-mock.ts → src/mocks/program-model-mock.ts
diff --git a/spec/public/mocks/programs-store-mock.ts → src/mocks/programs-store-mock.ts b/spec/public/mocks/programs-store-mock.ts → src/mocks/programs-store-mock.ts
diff --git a/spec/public/mocks/progressbar-mock.ts → src/mocks/progressbar-mock.ts b/spec/public/mocks/progressbar-mock.ts → src/mocks/progressbar-mock.ts
diff --git a/spec/public/mocks/series-model-mock.ts → src/mocks/series-model-mock.ts b/spec/public/mocks/series-model-mock.ts → src/mocks/series-model-mock.ts
diff --git a/spec/public/mocks/series-store-mock.ts → src/mocks/series-store-mock.ts b/spec/public/mocks/series-store-mock.ts → src/mocks/series-store-mock.ts
diff --git a/spec/public/mocks/setting-model-mock.ts → src/mocks/setting-model-mock.ts b/spec/public/mocks/setting-model-mock.ts → src/mocks/setting-model-mock.ts
diff --git a/spec/public/mocks/settings-store-mock.ts → src/mocks/settings-store-mock.ts b/spec/public/mocks/settings-store-mock.ts → src/mocks/settings-store-mock.ts
diff --git a/spec/public/mocks/sync-model-mock.ts → src/mocks/sync-model-mock.ts b/spec/public/mocks/sync-model-mock.ts → src/mocks/sync-model-mock.ts
diff --git a/spec/public/mocks/syncs-store-mock.ts → src/mocks/syncs-store-mock.ts b/spec/public/mocks/syncs-store-mock.ts → src/mocks/syncs-store-mock.ts
diff --git a/spec/public/mocks/test-controller.ts → src/mocks/test-controller.ts b/spec/public/mocks/test-controller.ts → src/mocks/test-controller.ts
diff --git a/spec/public/mocks/window-mock.ts → src/mocks/window-mock.ts b/spec/public/mocks/window-mock.ts → src/mocks/window-mock.ts
diff --git a/spec/public/mocks/worker-store-mock.ts → src/mocks/worker-store-mock.ts b/spec/public/mocks/worker-store-mock.ts → src/mocks/worker-store-mock.ts
diff --git a/spec/public/models/base-model.test.ts → src/models/base-model.test.ts b/spec/public/models/base-model.test.ts → src/models/base-model.test.ts
@@ -1,4 +1,4 @@
-import Base from "../../../src/models/base-model";
+import Base from "~/models/base-model";
 
 describe("Base", (): void => {
 	class TestModel extends Base {

diff --git a/spec/public/models/episode-model.test.ts → src/models/episode-model.test.ts b/spec/public/models/episode-model.test.ts → src/models/episode-model.test.ts
@@ -7,7 +7,7 @@ import type {
 	SinonStub
 } from "sinon";
 import DatabaseServiceMock from "~/mocks/database-service-mock";
-import Episode from "../../../src/models/episode-model";
+import Episode from "./episode-model";
 import sinon from "sinon";
 
 describe("Episode", (): void => {

diff --git a/spec/public/models/program-model.test.ts → src/models/program-model.test.ts b/spec/public/models/program-model.test.ts → src/models/program-model.test.ts
@@ -1,5 +1,5 @@
 import DatabaseServiceMock from "~/mocks/database-service-mock";
-import Program from "../../../src/models/program-model";
+import Program from "./program-model";
 import type { SinonStub } from "sinon";
 
 describe("Program", (): void => {

diff --git a/spec/public/models/series-model.test.ts → src/models/series-model.test.ts b/spec/public/models/series-model.test.ts → src/models/series-model.test.ts
@@ -3,7 +3,7 @@ import type {
 	PersistedSeries
 } from "~/models";
 import DatabaseServiceMock from "~/mocks/database-service-mock";
-import Series from "../../../src/models/series-model";
+import Series from "./series-model";
 import type { SinonStub } from "sinon";
 
 describe("Series", (): void => {

diff --git a/spec/public/models/setting-model.test.ts → src/models/setting-model.test.ts b/spec/public/models/setting-model.test.ts → src/models/setting-model.test.ts
@@ -1,5 +1,5 @@
 import DatabaseServiceMock from "~/mocks/database-service-mock";
-import Setting from "../../../src/models/setting-model";
+import Setting from "./setting-model";
 import type { SinonStub } from "sinon";
 
 describe("Setting", (): void => {

diff --git a/spec/public/models/sync-model.test.ts → src/models/sync-model.test.ts b/spec/public/models/sync-model.test.ts → src/models/sync-model.test.ts
@@ -4,7 +4,7 @@ import type {
 } from "~/models";
 import DatabaseServiceMock from "~/mocks/database-service-mock";
 import type { SinonStub } from "sinon";
-import Sync from "../../../src/models/sync-model";
+import Sync from "./sync-model";
 
 describe("Sync", (): void => {
 	let type: ModelType,

diff --git a/.../public/services/database-service.test.ts → src/services/database-service.test.ts b/.../public/services/database-service.test.ts → src/services/database-service.test.ts
@@ -1,4 +1,4 @@
-import DatabaseService from "../../../src/services/database-service";
+import DatabaseService from "./database-service";
 import type {	SinonSpyCall } from "sinon";
 import type { TVManagerStore } from "~/stores";
 import sinon from "sinon";

diff --git a/spec/public/stores/db.test.ts → src/stores/db.test.ts b/spec/public/stores/db.test.ts → src/stores/db.test.ts
@@ -3,7 +3,7 @@ import * as ProgramsStore from "~/mocks/programs-store-mock";
 import * as SeriesStore from "~/mocks/series-store-mock";
 import * as SettingsStore from "~/mocks/settings-store-mock";
 import * as SyncsStore from "~/mocks/syncs-store-mock";
-import { connect, disconnect } from "../../../src/stores/db";
+import { connect, disconnect } from "./db";
 import {
 	deleteDB,
 	openDB

diff --git a/spec/public/stores/episodes.test.ts → src/stores/episodes.test.ts b/spec/public/stores/episodes.test.ts → src/stores/episodes.test.ts
@@ -8,16 +8,16 @@ import type {
 import {
 	create,
 	upgradeTo
-} from "../../../src/stores/episodes";
+} from "./episodes";
 import {
 	deleteDB,
 	openDB
 } from "idb";
 import type {	IDBPDatabase } from "idb";
 import type { PersistedEpisode } from "~/models";
-import { upgradeTo as programsUpgradeTo } from "../../../src/stores/programs";
-import { upgradeTo as seriesUpgradeTo } from "../../../src/stores/series";
-import { upgradeTo as syncsUpgradeTo } from "../../../src/stores/syncs";
+import { upgradeTo as programsUpgradeTo } from "./programs";
+import { upgradeTo as seriesUpgradeTo } from "./series";
+import { upgradeTo as syncsUpgradeTo } from "./syncs";
 
 describe("episodes", (): void => {
 	let db: IDBPDatabase<TVManagerDB>;

diff --git a/spec/public/stores/programs.test.ts → src/stores/programs.test.ts b/spec/public/stores/programs.test.ts → src/stores/programs.test.ts
@@ -8,16 +8,16 @@ import type {
 import {
 	create,
 	upgradeTo
-} from "../../../src/stores/programs";
+} from "./programs";
 import {
 	deleteDB,
 	openDB
 } from "idb";
 import type { IDBPDatabase } from "idb";
 import type { PersistedProgram } from "~/models";
-import { upgradeTo as episodesUpgradeTo } from "../../../src/stores/episodes";
-import { upgradeTo as seriesUpgradeTo } from "../../../src/stores/series";
-import { upgradeTo as syncsUpgradeTo } from "../../../src/stores/syncs";
+import { upgradeTo as episodesUpgradeTo } from "./episodes";
+import { upgradeTo as seriesUpgradeTo } from "./series";
+import { upgradeTo as syncsUpgradeTo } from "./syncs";
 
 describe("programs", (): void => {
 	let db: IDBPDatabase<TVManagerDB>;

diff --git a/spec/public/stores/series.test.ts → src/stores/series.test.ts b/spec/public/stores/series.test.ts → src/stores/series.test.ts
@@ -8,16 +8,16 @@ import type {
 import {
 	create,
 	upgradeTo
-} from "../../../src/stores/series";
+} from "./series";
 import {
 	deleteDB,
 	openDB
 } from "idb";
 import type {	IDBPDatabase } from "idb";
 import type { PersistedSeries } from "~/models";
-import { upgradeTo as episodesUpgradeTo } from "../../../src/stores/episodes";
-import { upgradeTo as programsUpgradeTo } from "../../../src/stores/programs";
-import { upgradeTo as syncsUpgradeTo } from "../../../src/stores/syncs";
+import { upgradeTo as episodesUpgradeTo } from "./episodes";
+import { upgradeTo as programsUpgradeTo } from "./programs";
+import { upgradeTo as syncsUpgradeTo } from "./syncs";
 
 describe("series", (): void => {
 	let db: IDBPDatabase<TVManagerDB>;

diff --git a/spec/public/stores/settings.test.ts → src/stores/settings.test.ts b/spec/public/stores/settings.test.ts → src/stores/settings.test.ts
@@ -6,7 +6,7 @@ import type {
 import {
 	create,
 	upgradeTo
-} from "../../../src/stores/settings";
+} from "./settings";
 import {
 	deleteDB,
 	openDB

diff --git a/spec/public/stores/syncs.test.ts → src/stores/syncs.test.ts b/spec/public/stores/syncs.test.ts → src/stores/syncs.test.ts
@@ -6,7 +6,7 @@ import type {
 import {
 	create,
 	upgradeTo
-} from "../../../src/stores/syncs";
+} from "./syncs";
 import {
 	deleteDB,
 	openDB

diff --git a/spec/public/views/listTemplate.html → src/views/listTemplate.html b/spec/public/views/listTemplate.html → src/views/listTemplate.html
diff --git a/spec/public/views/test-view.html → src/views/test-view.html b/spec/public/views/test-view.html → src/views/test-view.html
diff --git a/tsconfig.json b/tsconfig.json
@@ -13,10 +13,7 @@
 		"module": "es2022",
 		"moduleResolution": "node",
 		"paths": {
-			"~*": [
-				"./src/*",
-				"./spec/public/*"
-			]
+			"~*": ["./src/*"]
 		},
 
 		// Emit