diff --git a/jest.config.js b/jest.config.js index 5521207612..4fc2b7def0 100644 --- a/jest.config.js +++ b/jest.config.js @@ -10,7 +10,22 @@ module.exports = { testEnvironment: 'jsdom', transform: { '^.+\\.vue$': 'vue-jest', - '^.+\\.(t|j)sx?$': ['@swc-node/jest'], + '^.+\\.(t|j)sx?$': [ + 'babel-jest', { + presets: [ + [ + '@babel/preset-env', + { + targets: { + node: true, + }, + }, + ], + '@babel/preset-typescript', + ], + plugins: ['@vue/babel-plugin-jsx'], + }, + ], }, moduleFileExtensions: ['vue', 'json', 'ts', 'tsx', 'js', 'json'], } diff --git a/package.json b/package.json index 0d5b87f744..6b529461c5 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,10 @@ }, "devDependencies": { "@babel/core": "^7.11.4", + "@babel/preset-env": "^7.11.5", + "@babel/preset-typescript": "^7.10.4", "@commitlint/cli": "^9.1.2", "@commitlint/config-conventional": "^9.1.2", - "@swc-node/jest": "^0.3.4", "@types/jest": "^26.0.10", "@types/lodash": "^4.14.161", "@typescript-eslint/eslint-plugin": "^3.10.1", @@ -31,6 +32,7 @@ "@vue/compiler-sfc": "^3.0.0", "@vue/component-compiler-utils": "^3.2.0", "algoliasearch": "^4.4.0", + "babel-jest": "^26.3.0", "babel-loader": "^8.1.0", "babel-preset-vue": "^2.0.2", "cp-cli": "^2.0.0", diff --git a/packages/button/src/button.vue b/packages/button/src/button.vue index 1c71361778..983eeb9459 100644 --- a/packages/button/src/button.vue +++ b/packages/button/src/button.vue @@ -107,7 +107,7 @@ export default defineComponent({ emits: ['click'], - setup(props, ctx): IButtonSetups { + setup(props, ctx) { // inject const elForm = inject('elForm', {} as any) const elFormItem = inject('elFormItem', {} as any) @@ -130,7 +130,6 @@ export default defineComponent({ } return { - _elFormItemSize, buttonSize, buttonDisabled, handleClick, diff --git a/packages/dropdown/__tests__/dropdown.spec.ts b/packages/dropdown/__tests__/dropdown.spec.tsx similarity index 91% rename from packages/dropdown/__tests__/dropdown.spec.ts rename to packages/dropdown/__tests__/dropdown.spec.tsx index 57826ee7dc..b6ef413657 100644 --- a/packages/dropdown/__tests__/dropdown.spec.ts +++ b/packages/dropdown/__tests__/dropdown.spec.tsx @@ -23,25 +23,33 @@ const _mount = (template: string, data, otherObj?) => mount({ describe('Dropdown', () => { test('create', async () => { - const wrapper = _mount( - ` - - - dropdown - - - - `, - () => ({}), - ) + const wrapper = mount({ + setup() { + return () => ( + ( + + Apple + Orange + Cherry + Peach + Pear + + ) + } + } + > + + dropdown + + + ) + } + }) const content = wrapper.findComponent({ ref: 'b' }).vm.$refs.popper as any const triggerElm = wrapper.find('.el-dropdown-link') expect(content.visible).toBe(false) diff --git a/packages/dropdown/src/dropdown-menu.vue b/packages/dropdown/src/dropdown-menu.vue index db2f681eba..a91ed78863 100644 --- a/packages/dropdown/src/dropdown-menu.vue +++ b/packages/dropdown/src/dropdown-menu.vue @@ -9,7 +9,7 @@