From 7690edd86932c9d5601f4c4e4d10a968edf7aaa9 Mon Sep 17 00:00:00 2001 From: KonpekiCode <512054675@qq.com> Date: Fri, 24 Dec 2021 14:37:22 +0800 Subject: [PATCH 1/4] fix: ignore coverage (#121) --- packages/cli/oriTemplate/__.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli/oriTemplate/__.gitignore b/packages/cli/oriTemplate/__.gitignore index e69dc4a..ad25bc9 100644 --- a/packages/cli/oriTemplate/__.gitignore +++ b/packages/cli/oriTemplate/__.gitignore @@ -5,3 +5,4 @@ dist-ssr *.local .origin *.d.ts +coverage From 239243306de04abbb2335a714c0d623bf71a7227 Mon Sep 17 00:00:00 2001 From: KonpekiCode <512054675@qq.com> Date: Fri, 24 Dec 2021 14:38:42 +0800 Subject: [PATCH 2/4] docs: update README.md (#122) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 196daa1..9b1f717 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ ## Features - [Vue 3](https://github.com/vuejs/vue-next) & [Vite2](https://github.com/vitejs/vite) - [Vue i18n](https://github.com/intlify/vue-i18n-next) & [Vuex](https://github.com/vuejs/vue-next) intergrated +- [Jest](https://jestjs.io/) or [Vitest](https://vitest.dev/) for Vue component testing - Global styles with css, sass, less or stylus - Auto-imported Vue components - File based routing and layouts From 1e12f9df19bba2cde42c34b31e67a535b568e74a Mon Sep 17 00:00:00 2001 From: KonpekiCode <512054675@qq.com> Date: Thu, 10 Feb 2022 20:46:23 +0800 Subject: [PATCH 3/4] feat: migrate test to vitest (#124) * feat: migrate test to vitest * fix: ci failure * fix: upgrade vitest --- .github/workflows/ci.yml | 2 +- package.json | 6 +- .../cli-service/__tests__/cli-service.spec.ts | 12 +- .../__tests__/file/servicedemo/package.json | 2 +- packages/cli-service/package.json | 2 +- .../templates/test_setup/package.json | 2 +- .../__tests__/__snapshots__/cli.spec.ts.snap | 36 +-- packages/cli/__tests__/cli.spec.ts | 3 +- packages/cli/__tests__/results.ts | 2 +- packages/cli/oriTemplate/__package.json | 6 +- .../__tests__/__snapshots__/file.spec.ts.snap | 10 +- .../__snapshots__/generates.spec.ts.snap | 120 ++++---- .../__snapshots__/pages.spec.ts.snap | 66 ++-- vitest.config.ts | 14 + yarn.lock | 285 ++++++++++++++++-- 15 files changed, 415 insertions(+), 153 deletions(-) create mode 100644 vitest.config.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03029bf..5a67971 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - node_version: [12, 14, 16] + node_version: [14, 16] include: - os: macos-latest node_version: 14 diff --git a/package.json b/package.json index b420733..cf81ce4 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "lerna run build", "lint": "eslint ./packages --ext .vue,.js,.ts", - "test": "yarn build && jest", + "test": "yarn build && vitest run --config vitest.config.ts", "fix": "yarn format --write", "format": "prettier --config .prettierrc --ignore-path .prettierignore \"**/*.{ts,js,json,html}\"" }, @@ -23,6 +23,7 @@ "@types/node": "^16.3.3", "@typescript-eslint/eslint-plugin": "^4.28.3", "@typescript-eslint/parser": "^4.28.3", + "c8": "^7.10.0", "eslint": "^7.31.0", "eslint-plugin-vue": "^7.14.0", "jest": "^27.0.6", @@ -32,7 +33,8 @@ "ts-jest": "^27.0.3", "ts-node": "^10.1.0", "typescript": "^4.3.5", - "vite": "^2.5.0", + "vite": "^2.7.13", + "vitest": "^0.3.1", "yorkie": "^2.0.0" }, "gitHooks": { diff --git a/packages/cli-service/__tests__/cli-service.spec.ts b/packages/cli-service/__tests__/cli-service.spec.ts index ad396a9..6af8961 100644 --- a/packages/cli-service/__tests__/cli-service.spec.ts +++ b/packages/cli-service/__tests__/cli-service.spec.ts @@ -2,20 +2,20 @@ import { run } from '../src' import { build, createServer } from 'vite' import { join } from 'path' -jest.mock('vite', () => { +vi.mock('vite', () => { const server = { - listen: jest.fn(), + listen: vi.fn(), } return { - build: jest.fn(), - createServer: jest.fn().mockReturnValue(server), - loadConfigFromFile: jest.fn(), + build: vi.fn(), + createServer: vi.fn().mockReturnValue(server), + loadConfigFromFile: vi.fn(), } }) describe('cli', () => { afterEach(() => { - jest.resetAllMocks() + vi.resetAllMocks() }) test('call dev', async () => { diff --git a/packages/cli-service/__tests__/file/servicedemo/package.json b/packages/cli-service/__tests__/file/servicedemo/package.json index ca44ddf..a54456e 100644 --- a/packages/cli-service/__tests__/file/servicedemo/package.json +++ b/packages/cli-service/__tests__/file/servicedemo/package.json @@ -9,7 +9,7 @@ "vue": "^3.0.4" }, "devDependencies": { - "vite": "^1.0.0-rc.13", + "vite": "^2.7.13", "@vue/compiler-sfc": "^3.0.4" } } diff --git a/packages/cli-service/package.json b/packages/cli-service/package.json index ce7b290..5ec679d 100644 --- a/packages/cli-service/package.json +++ b/packages/cli-service/package.json @@ -20,6 +20,6 @@ "esm": "^3.2.25", "fs-extra": "^10.0.0", "pkg-dir": "^5.0.0", - "vite": "^2.4.4" + "vite": "^2.7.13" } } diff --git a/packages/cli-test-utils/templates/test_setup/package.json b/packages/cli-test-utils/templates/test_setup/package.json index 735f51b..fd56b0f 100644 --- a/packages/cli-test-utils/templates/test_setup/package.json +++ b/packages/cli-test-utils/templates/test_setup/package.json @@ -15,7 +15,7 @@ "@babel/preset-env": "^7.15.8", "@vitejs/plugin-vue": "^1.3.0", "typescript": "^4.3.2", - "vite": "^2.6.13", + "vite": "^2.7.13", "vue-tsc": "^0.2.2" } } diff --git a/packages/cli/__tests__/__snapshots__/cli.spec.ts.snap b/packages/cli/__tests__/__snapshots__/cli.spec.ts.snap index b21c85f..4245cf7 100644 --- a/packages/cli/__tests__/__snapshots__/cli.spec.ts.snap +++ b/packages/cli/__tests__/__snapshots__/cli.spec.ts.snap @@ -1,6 +1,6 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1 -exports[`ori --help: A2 1`] = ` +exports[`ori --help > A2 1`] = ` "Usage: ori [options] Options: @@ -15,7 +15,7 @@ Commands: help [command] display help for command" `; -exports[`ori -h: A1 1`] = ` +exports[`ori -h > A1 1`] = ` "Usage: ori [options] Options: @@ -30,7 +30,7 @@ Commands: help [command] display help for command" `; -exports[`ori build --help: A7 1`] = ` +exports[`ori build --help > A7 1`] = ` "Usage: ori build [options] alias of \\"ori build\\" in the current project @@ -39,7 +39,7 @@ Options: -h, --help display help for command" `; -exports[`ori dev --help: A6 1`] = ` +exports[`ori dev --help > A6 1`] = ` "Usage: ori dev [options] alias of \\"ori dev\\" in the current project @@ -50,7 +50,7 @@ Options: -h, --help display help for command" `; -exports[`ori init --help: A5 1`] = ` +exports[`ori init --help > A5 1`] = ` "Usage: ori init [options] init a new project @@ -62,7 +62,7 @@ Options: -h, --help display help for command" `; -exports[`ori init with all plugins: A3 1`] = ` +exports[`ori init with all plugins > A3 1`] = ` "