From d26304914e8a0a479daa8e7b912c7b2ffc729b02 Mon Sep 17 00:00:00 2001 From: Andreani Jean Date: Wed, 10 May 2023 10:56:18 +0200 Subject: [PATCH] wip --- .../unit/components}/BetaText.spec.js | 4 ++-- .../__tests__ => tests/unit/components}/Header.spec.js | 4 ++-- .../__tests__ => tests/unit/components}/Link.spec.js | 2 +- .../unit/components}/Terminal.spec.js | 6 +++--- .../unit/components}/__snapshots__/Link.spec.js.snap | 0 .../unit/views}/MyAccountView.spec.js | 2 +- .../__tests__ => tests/unit/views}/UploadView.spec.js | 4 ++-- tsconfig.app.json | 2 +- vite.config.ts | 6 +----- yarn.lock | 10 +++++----- 10 files changed, 18 insertions(+), 22 deletions(-) rename src/{components/__tests__ => tests/unit/components}/BetaText.spec.js (85%) rename src/{components/__tests__ => tests/unit/components}/Header.spec.js (97%) rename src/{components/__tests__ => tests/unit/components}/Link.spec.js (98%) rename src/{components/__tests__ => tests/unit/components}/Terminal.spec.js (95%) rename src/{components/__tests__ => tests/unit/components}/__snapshots__/Link.spec.js.snap (100%) rename src/{views/__tests__ => tests/unit/views}/MyAccountView.spec.js (86%) rename src/{views/__tests__ => tests/unit/views}/UploadView.spec.js (89%) diff --git a/src/components/__tests__/BetaText.spec.js b/src/tests/unit/components/BetaText.spec.js similarity index 85% rename from src/components/__tests__/BetaText.spec.js rename to src/tests/unit/components/BetaText.spec.js index 52e0565..692754a 100644 --- a/src/components/__tests__/BetaText.spec.js +++ b/src/tests/unit/components/BetaText.spec.js @@ -1,8 +1,8 @@ import { it, describe, expect } from 'vitest' import { shallowMount } from '@vue/test-utils' -import BetaText from '../BetaText.vue' +import BetaText from '../../../components/BetaText.vue' import { createI18n } from 'vue-i18n' -import fr from '../../locales/fr.json' +import fr from '../../../locales/fr.json' const i18n = createI18n({ locale: 'fr', diff --git a/src/components/__tests__/Header.spec.js b/src/tests/unit/components/Header.spec.js similarity index 97% rename from src/components/__tests__/Header.spec.js rename to src/tests/unit/components/Header.spec.js index 1013f42..b0bbef0 100644 --- a/src/components/__tests__/Header.spec.js +++ b/src/tests/unit/components/Header.spec.js @@ -1,8 +1,8 @@ import { vi, it, beforeEach, describe, expect } from 'vitest' import { shallowMount } from '@vue/test-utils' import { createI18n } from 'vue-i18n' -import fr from '../../locales/fr.json' -import Header from '../Header.vue' +import fr from '../../../locales/fr.json' +import Header from '../../../components/Header.vue' vi.mock('vue-router') const i18n = createI18n({ diff --git a/src/components/__tests__/Link.spec.js b/src/tests/unit/components/Link.spec.js similarity index 98% rename from src/components/__tests__/Link.spec.js rename to src/tests/unit/components/Link.spec.js index cf5a714..dbf5e1a 100644 --- a/src/components/__tests__/Link.spec.js +++ b/src/tests/unit/components/Link.spec.js @@ -1,6 +1,6 @@ import { test, describe, vi, expect } from 'vitest' import { mount, shallowMount } from '@vue/test-utils' -import Link from '../Link.vue' +import Link from '../../../components/Link.vue' import { useI18n } from 'vue-i18n' vi.mock('vue-i18n') diff --git a/src/components/__tests__/Terminal.spec.js b/src/tests/unit/components/Terminal.spec.js similarity index 95% rename from src/components/__tests__/Terminal.spec.js rename to src/tests/unit/components/Terminal.spec.js index 8c428bd..17ae0d3 100644 --- a/src/components/__tests__/Terminal.spec.js +++ b/src/tests/unit/components/Terminal.spec.js @@ -1,9 +1,9 @@ import { it, describe, expect, vi } from 'vitest' import { shallowMount, mount } from '@vue/test-utils' -import Terminal from '../Terminal.vue' -import Button from '../Button.vue' +import Terminal from '../../../components/Terminal.vue' +import Button from '../../../components/Button.vue' import { createI18n } from 'vue-i18n' -import fr from '../../locales/fr.json' +import fr from '../../../locales/fr.json' const i18n = createI18n({ locale: 'fr', diff --git a/src/components/__tests__/__snapshots__/Link.spec.js.snap b/src/tests/unit/components/__snapshots__/Link.spec.js.snap similarity index 100% rename from src/components/__tests__/__snapshots__/Link.spec.js.snap rename to src/tests/unit/components/__snapshots__/Link.spec.js.snap diff --git a/src/views/__tests__/MyAccountView.spec.js b/src/tests/unit/views/MyAccountView.spec.js similarity index 86% rename from src/views/__tests__/MyAccountView.spec.js rename to src/tests/unit/views/MyAccountView.spec.js index dcf751e..9197881 100644 --- a/src/views/__tests__/MyAccountView.spec.js +++ b/src/tests/unit/views/MyAccountView.spec.js @@ -1,6 +1,6 @@ import { it, describe, expect } from 'vitest' import { shallowMount } from '@vue/test-utils' -import MyAccountView from '../MyAccountView.vue' +import MyAccountView from '../../../views/MyAccountView.vue' describe('Template', () => { it('should render the view with the iframe', async () => { diff --git a/src/views/__tests__/UploadView.spec.js b/src/tests/unit/views/UploadView.spec.js similarity index 89% rename from src/views/__tests__/UploadView.spec.js rename to src/tests/unit/views/UploadView.spec.js index e179364..62986c6 100644 --- a/src/views/__tests__/UploadView.spec.js +++ b/src/tests/unit/views/UploadView.spec.js @@ -1,8 +1,8 @@ import { it, describe, expect } from 'vitest' import { shallowMount } from '@vue/test-utils' -import UploadView from '../UploadView.vue' +import UploadView from '../../../views/UploadView.vue' import { createI18n } from 'vue-i18n' -import fr from '../../locales/fr.json' +import fr from '../../../locales/fr.json' const i18n = createI18n({ locale: 'fr', diff --git a/tsconfig.app.json b/tsconfig.app.json index 111f200..9e7bc0a 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -1,7 +1,7 @@ { "extends": "@vue/tsconfig/tsconfig.web.json", "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "src/locales/*.json"], - "exclude": ["src/**/__tests__/*"], + "exclude": ["src/tests/unit/*"], "compilerOptions": { "composite": true, "baseUrl": ".", diff --git a/vite.config.ts b/vite.config.ts index 20d7de6..e54f894 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -9,11 +9,7 @@ export default defineConfig({ host: true, port: 5173, strictPort: true, - hmr: { - port: 9000, - overlay: false, - protocol: 'wss' - } + hmr: false }, base: '/', plugins: [vue(), eslintPlugin()], diff --git a/yarn.lock b/yarn.lock index d223704..310ffa2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1651,7 +1651,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: cross-spawn@^7.0.2: version "7.0.3" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== dependencies: path-key "^3.1.0" @@ -3103,7 +3103,7 @@ is-number@^7.0.0: is-path-inside@^3.0.3: version "3.0.3" - resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== is-plain-obj@^4.0.0: @@ -4550,7 +4550,7 @@ pseudomap@^1.0.2: psl@^1.1.33: version "1.9.0" - resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== pump@^3.0.0: @@ -4769,7 +4769,7 @@ reusify@^1.0.4: rimraf@^3.0.2: version "3.0.2" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: glob "^7.1.3" @@ -4818,7 +4818,7 @@ safe-regex-test@^1.0.0: "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" - resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sass@^1.62.0: