Skip to content

Commit

Permalink
chore(deps): replace jest by vitest
Browse files Browse the repository at this point in the history
  • Loading branch information
jledentu committed Nov 13, 2023
1 parent 6f443c6 commit 09c8392
Show file tree
Hide file tree
Showing 18 changed files with 850 additions and 1,827,013 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ module.exports = {
node: true,
commonjs: true,
es6: true,
jest: true,
},
rules: {
// allow async-await
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ npm run build
# Run development server with storybook
npm run storybook

# Run all tests with lint/jest
# Run all tests with lint/vitest
npm run test

# Run test in watch mode
Expand Down
23 changes: 0 additions & 23 deletions jest.config.js

This file was deleted.

17 changes: 7 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"storybook": "storybook dev -p 6006",
"storybook:build": "storybook build -c .storybook -o docs/dist/stories",
"cz": "git-cz",
"test": "$npm_execpath run lint && jest --verbose --coverage",
"test:update": "jest --verbose --updateSnapshot",
"test:watch": "jest --verbose --watchAll --notify",
"test": "$npm_execpath run lint && vitest --coverage",
"test:update": "vitest -u",
"test:watch": "vitest",
"lint": "eslint --ext .js,.vue .",
"lint:fix": "eslint --ext .js,.vue . --fix",
"prepublishOnly": "$npm_execpath run build",
Expand All @@ -73,16 +73,15 @@
"@storybook/vue3-vite": "^7.5.3",
"@vitejs/plugin-vue": "^4.4.1",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"@vitest/coverage-v8": "^0.34.6",
"@vue/babel-plugin-jsx": "^1.1.5",
"@vue/babel-preset-jsx": "^1.2.4",
"@vue/compat": "^3.2.37",
"@vue/compiler-sfc": "^3.2.37",
"@vue/test-utils": "2.0.2",
"@vue/vue3-jest": "27",
"@vuepress/plugin-register-components": "^2.0.0-beta.61",
"babel-core": "^7.0.0-bridge.0",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-jest": "^27.5.1",
"babel-loader": "^8.2.3",
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-plugin-module-resolver": "^4.0.0",
Expand All @@ -100,15 +99,12 @@
"eslint-import-resolver-webpack": "^0.13.2",
"eslint-plugin-html": "^6.2.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^26.1.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-storybook": "^0.6.15",
"eslint-plugin-vue": "^8.5.0",
"happy-dom": "^12.10.3",
"husky": "^4.2.3",
"jest": "^27.5.1",
"jest-serializer-html": "^7.1.0",
"jest-serializer-vue": "^2.0.2",
"jest-vue-preprocessor": "^1.7.1",
"jest-serializer-vue": "^3.1.0",
"lint-staged": "^10.0.7",
"prettier": "^2.5.1",
"react": "^18.2.0",
Expand All @@ -126,6 +122,7 @@
"storybook": "^7.5.3",
"uglify-es": "^3.3.4",
"vite": "^4.5.0",
"vitest": "^0.34.6",
"vue": "^3.2.37",
"vue-docgen-cli": "^4.44.29",
"vuepress": "2.0.0-beta.61"
Expand Down
1 change: 1 addition & 0 deletions src/components/__tests__/Finder.test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { describe, it, expect } from "vitest";
import { mount } from "@vue/test-utils";
import Finder from "../Finder.vue";

Expand Down
31 changes: 16 additions & 15 deletions src/components/__tests__/FinderItem.test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { vi, describe, it, beforeEach, expect } from "vitest";
import { mount } from "@vue/test-utils";
import { h } from "vue";
import TreeModel from "@/utils/tree-model";
import FinderItem from "../FinderItem.vue";

jest.mock("@/utils/tree-model");
jest.useFakeTimers();
vi.mock("@/utils/tree-model");
vi.useFakeTimers();

describe("FinderItem", () => {
let treeModel;
Expand Down Expand Up @@ -185,8 +186,8 @@ describe("FinderItem", () => {
describe("dragstart", () => {
it("should call treeModel.startDrag", async () => {
const dataTransfer = {
setDragImage: jest.fn(),
setData: jest.fn(),
setDragImage: vi.fn(),
setData: vi.fn(),
};
const wrapper = mount(FinderItem, {
props: {
Expand All @@ -210,8 +211,8 @@ describe("FinderItem", () => {

it("should call treeModel.startDrag if `dragEnabled` is a function returning `true`", async () => {
const dataTransfer = {
setDragImage: jest.fn(),
setData: jest.fn(),
setDragImage: vi.fn(),
setData: vi.fn(),
};
const wrapper = mount(FinderItem, {
props: {
Expand Down Expand Up @@ -261,8 +262,8 @@ describe("FinderItem", () => {

it("should initialize drag image element if dragImageComponent is defined", async () => {
const dataTransfer = {
setDragImage: jest.fn(),
setData: jest.fn(),
setDragImage: vi.fn(),
setData: vi.fn(),
};
const wrapper = mount(FinderItem, {
props: {
Expand Down Expand Up @@ -309,7 +310,7 @@ describe("FinderItem", () => {
});

await wrapper.find(".item").trigger("dragenter");
jest.runAllTimers();
vi.runAllTimers();

expect(treeModel.expandNode).toHaveBeenCalledWith(
"test111",
Expand All @@ -330,7 +331,7 @@ describe("FinderItem", () => {
});

await wrapper.find(".item").trigger("dragenter");
jest.runAllTimers();
vi.runAllTimers();

expect(treeModel.expandNode).not.toHaveBeenCalled();
});
Expand All @@ -348,7 +349,7 @@ describe("FinderItem", () => {
});

await wrapper.find(".item").trigger("dragenter");
jest.runAllTimers();
vi.runAllTimers();

expect(treeModel.expandNode).not.toHaveBeenCalled();
});
Expand All @@ -364,7 +365,7 @@ describe("FinderItem", () => {

await wrapper.find(".item").trigger("dragenter");
await wrapper.find(".item").trigger("dragleave");
jest.runAllTimers();
vi.runAllTimers();

expect(treeModel.expandNode).not.toHaveBeenCalled();
});
Expand All @@ -385,7 +386,7 @@ describe("FinderItem", () => {
},
});
await wrapper.vm.$nextTick();
jest.runAllTimers();
vi.runAllTimers();

expect(treeModel.expandNode).not.toHaveBeenCalled();
});
Expand Down Expand Up @@ -498,8 +499,8 @@ describe("FinderItem", () => {

it("should remove ghost element if 'dragImageComponent' is defined", async () => {
const dataTransfer = {
setDragImage: jest.fn(),
setData: jest.fn(),
setDragImage: vi.fn(),
setData: vi.fn(),
};
const wrapper = mount(FinderItem, {
props: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/__tests__/FinderList.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { vi, describe, it, beforeEach, expect } from "vitest";
import { mount } from "@vue/test-utils";
import TreeModel from "@/utils/tree-model";
import FinderList from "../FinderList.vue";

jest.mock("@/utils/tree-model");
vi.mock("@/utils/tree-model");

describe("FinderList", () => {
let treeModel;
Expand Down
3 changes: 2 additions & 1 deletion src/components/__tests__/FinderListDropZone.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { vi, describe, it, beforeEach, expect } from "vitest";
import { mount } from "@vue/test-utils";
import TreeModel from "@/utils/tree-model";
import FinderListDropZone from "../FinderListDropZone.vue";

jest.mock("@/utils/tree-model");
vi.mock("@/utils/tree-model");

describe("FinderListDropZone", () => {
let treeModel;
Expand Down
Loading

0 comments on commit 09c8392

Please sign in to comment.