From ee1ee0fe29cb2f464eaeacf0c2a8c0d28cb6ccd5 Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Sun, 5 Sep 2021 16:33:28 +0800
Subject: [PATCH] test: fix jest failure

---
 packages/vant-cli/src/config/jest.setup.ts          | 11 -----------
 packages/vant/src/calendar/demo/TiledDisplay.vue    |  1 +
 packages/vant/src/field/demo/Autosize.vue           |  2 ++
 packages/vant/src/field/demo/BasicUsage.vue         |  2 ++
 packages/vant/src/field/demo/CustomType.vue         |  2 ++
 packages/vant/src/field/demo/Disabled.vue           |  2 ++
 packages/vant/src/field/demo/ErrorInfo.vue          |  2 ++
 packages/vant/src/field/demo/FormatValue.vue        |  2 ++
 packages/vant/src/field/demo/InputAlign.vue         |  2 ++
 packages/vant/src/field/demo/InsertButton.vue       |  3 +++
 packages/vant/src/field/demo/ShowIcon.vue           |  2 ++
 packages/vant/src/field/demo/ShowWordLimit.vue      |  2 ++
 packages/vant/src/form/demo/BasicUsage.vue          |  4 ++++
 packages/vant/src/form/demo/FieldType.vue           | 13 +++++++++++++
 packages/vant/src/form/demo/FieldTypeArea.vue       |  4 +++-
 packages/vant/src/form/demo/FieldTypeCalendar.vue   |  2 ++
 .../vant/src/form/demo/FieldTypeDatetimePicker.vue  |  3 +++
 packages/vant/src/form/demo/FieldTypePicker.vue     |  3 +++
 packages/vant/src/form/demo/ValidateRules.vue       |  6 +++++-
 packages/vant/test/demo.ts                          |  1 -
 20 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/packages/vant-cli/src/config/jest.setup.ts b/packages/vant-cli/src/config/jest.setup.ts
index b3b0e5798..5d72226ba 100644
--- a/packages/vant-cli/src/config/jest.setup.ts
+++ b/packages/vant-cli/src/config/jest.setup.ts
@@ -1,12 +1 @@
-/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
-// @ts-ignore
-import vant from '../../dist/package-entry';
 import 'jest-canvas-mock';
-
-declare global {
-  interface Window {
-    vant: any;
-  }
-}
-
-window.vant = vant;
diff --git a/packages/vant/src/calendar/demo/TiledDisplay.vue b/packages/vant/src/calendar/demo/TiledDisplay.vue
index ced2ea4ad..e789ce382 100644
--- a/packages/vant/src/calendar/demo/TiledDisplay.vue
+++ b/packages/vant/src/calendar/demo/TiledDisplay.vue
@@ -1,4 +1,5 @@
 <script setup>
+import VanCalendar from '..';
 import { useTranslate } from '../../../docs/site/use-translate';
 
 const minDate = new Date(2012, 0, 10);
diff --git a/packages/vant/src/field/demo/Autosize.vue b/packages/vant/src/field/demo/Autosize.vue
index 99fa474a7..97380a491 100644
--- a/packages/vant/src/field/demo/Autosize.vue
+++ b/packages/vant/src/field/demo/Autosize.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/field/demo/BasicUsage.vue b/packages/vant/src/field/demo/BasicUsage.vue
index 89718dcc0..602d9ef20 100644
--- a/packages/vant/src/field/demo/BasicUsage.vue
+++ b/packages/vant/src/field/demo/BasicUsage.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/field/demo/CustomType.vue b/packages/vant/src/field/demo/CustomType.vue
index 0c9bbcb7a..0c3518a4f 100644
--- a/packages/vant/src/field/demo/CustomType.vue
+++ b/packages/vant/src/field/demo/CustomType.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/field/demo/Disabled.vue b/packages/vant/src/field/demo/Disabled.vue
index 997ef2ee2..7e2e774fc 100644
--- a/packages/vant/src/field/demo/Disabled.vue
+++ b/packages/vant/src/field/demo/Disabled.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanCellGroup from '../../cell-group';
 import { useTranslate } from '../../../docs/site/use-translate';
 
 const t = useTranslate({
diff --git a/packages/vant/src/field/demo/ErrorInfo.vue b/packages/vant/src/field/demo/ErrorInfo.vue
index 9c8f9ba60..8a99e2b5d 100644
--- a/packages/vant/src/field/demo/ErrorInfo.vue
+++ b/packages/vant/src/field/demo/ErrorInfo.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/field/demo/FormatValue.vue b/packages/vant/src/field/demo/FormatValue.vue
index 44d23bedd..70d067cb4 100644
--- a/packages/vant/src/field/demo/FormatValue.vue
+++ b/packages/vant/src/field/demo/FormatValue.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/field/demo/InputAlign.vue b/packages/vant/src/field/demo/InputAlign.vue
index f5edd7e2a..9652be1d6 100644
--- a/packages/vant/src/field/demo/InputAlign.vue
+++ b/packages/vant/src/field/demo/InputAlign.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/field/demo/InsertButton.vue b/packages/vant/src/field/demo/InsertButton.vue
index 303fa113d..6c1b3bade 100644
--- a/packages/vant/src/field/demo/InsertButton.vue
+++ b/packages/vant/src/field/demo/InsertButton.vue
@@ -1,4 +1,7 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanButton from '../../button';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/field/demo/ShowIcon.vue b/packages/vant/src/field/demo/ShowIcon.vue
index 4fad98624..f91c890e2 100644
--- a/packages/vant/src/field/demo/ShowIcon.vue
+++ b/packages/vant/src/field/demo/ShowIcon.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/field/demo/ShowWordLimit.vue b/packages/vant/src/field/demo/ShowWordLimit.vue
index fd0077208..8e6e6fe12 100644
--- a/packages/vant/src/field/demo/ShowWordLimit.vue
+++ b/packages/vant/src/field/demo/ShowWordLimit.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '..';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/form/demo/BasicUsage.vue b/packages/vant/src/form/demo/BasicUsage.vue
index cd881fb41..0965558fe 100644
--- a/packages/vant/src/form/demo/BasicUsage.vue
+++ b/packages/vant/src/form/demo/BasicUsage.vue
@@ -1,4 +1,8 @@
 <script setup lang="ts">
+import VanForm from '..';
+import VanField from '../../field';
+import VanButton from '../../button';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 import { FieldValidateError } from '../../field/types';
diff --git a/packages/vant/src/form/demo/FieldType.vue b/packages/vant/src/form/demo/FieldType.vue
index 8c90ee8e2..81b42e7c5 100644
--- a/packages/vant/src/form/demo/FieldType.vue
+++ b/packages/vant/src/form/demo/FieldType.vue
@@ -1,6 +1,19 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
+import VanForm from '..';
+import VanRate from '../../rate';
+import VanRadio from '../../radio';
+import VanField from '../../field';
+import VanButton from '../../button';
+import VanSlider from '../../slider';
+import VanSwitch from '../../switch';
+import VanStepper from '../../stepper';
+import VanCheckbox from '../../checkbox';
+import VanUploader from '../../uploader';
+import VanCellGroup from '../../cell-group';
+import VanRadioGroup from '../../radio-group';
+import VanCheckboxGroup from '../../checkbox-group';
 import FieldTypeArea from './FieldTypeArea.vue';
 import FieldTypePicker from './FieldTypePicker.vue';
 import FieldTypeCalendar from './FieldTypeCalendar.vue';
diff --git a/packages/vant/src/form/demo/FieldTypeArea.vue b/packages/vant/src/form/demo/FieldTypeArea.vue
index 37814caa0..af5a04f1b 100644
--- a/packages/vant/src/form/demo/FieldTypeArea.vue
+++ b/packages/vant/src/form/demo/FieldTypeArea.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
+import VanArea, { AreaColumnOption } from '../../area';
+import VanField from '../../field';
+import VanPopup from '../../popup';
 import { ref } from 'vue';
 import { areaList } from '@vant/area-data';
 import { useTranslate } from '../../../docs/site/use-translate';
-import { AreaColumnOption } from '../../area';
 import { areaListEn } from '../../area/demo/area-en';
 
 const t = useTranslate({
diff --git a/packages/vant/src/form/demo/FieldTypeCalendar.vue b/packages/vant/src/form/demo/FieldTypeCalendar.vue
index faba5cc23..83f46d984 100644
--- a/packages/vant/src/form/demo/FieldTypeCalendar.vue
+++ b/packages/vant/src/form/demo/FieldTypeCalendar.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import VanField from '../../field';
+import VanCalendar from '../../calendar';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/form/demo/FieldTypeDatetimePicker.vue b/packages/vant/src/form/demo/FieldTypeDatetimePicker.vue
index 0b0dad88c..94d4bf281 100644
--- a/packages/vant/src/form/demo/FieldTypeDatetimePicker.vue
+++ b/packages/vant/src/form/demo/FieldTypeDatetimePicker.vue
@@ -1,4 +1,7 @@
 <script setup lang="ts">
+import VanField from '../../field';
+import VanPopup from '../../popup';
+import VanDatetimePicker from '../../datetime-picker';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/form/demo/FieldTypePicker.vue b/packages/vant/src/form/demo/FieldTypePicker.vue
index 99aac9600..d7587eee6 100644
--- a/packages/vant/src/form/demo/FieldTypePicker.vue
+++ b/packages/vant/src/form/demo/FieldTypePicker.vue
@@ -1,4 +1,7 @@
 <script setup lang="ts">
+import VanField from '../../field';
+import VanPopup from '../../popup';
+import VanPicker from '../../picker';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 
diff --git a/packages/vant/src/form/demo/ValidateRules.vue b/packages/vant/src/form/demo/ValidateRules.vue
index a7948b387..9f0d939c8 100644
--- a/packages/vant/src/form/demo/ValidateRules.vue
+++ b/packages/vant/src/form/demo/ValidateRules.vue
@@ -1,4 +1,8 @@
 <script setup lang="ts">
+import VanForm from '../../form';
+import VanField from '../../field';
+import VanButton from '../../button';
+import VanCellGroup from '../../cell-group';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 import { FieldValidateError } from '../../field/types';
@@ -42,7 +46,7 @@ const validator = (val: string) => /1\d{10}/.test(val);
 const validatorMessage = (val: string) => t('invalid', val);
 
 const asyncValidator = (val: string) =>
-  new Promise((resolve) => {
+  new Promise<boolean>((resolve) => {
     Toast.loading(t('validating'));
 
     setTimeout(() => {
diff --git a/packages/vant/test/demo.ts b/packages/vant/test/demo.ts
index 33c271919..77b133af9 100644
--- a/packages/vant/test/demo.ts
+++ b/packages/vant/test/demo.ts
@@ -27,7 +27,6 @@ export function snapshotDemo(Demo: any, option: any = {}) {
         components: {
           'demo-block': EmptyComponent,
         },
-        plugins: [(window as any).vant],
       },
     });