@dimailn/vuetify 2.7.2-alpha27 → 2.7.2-alpha28

package/src/components/VBanner/__tests__/VBanner.spec.ts

@@ -10,6 +10,7 @@ import {
   mount,
   Wrapper,
 } from '@vue/test-utils'
+import { h } from 'vue'
 
 // Types
 import { ExtractVue } from '../../../util/mixins'
@@ -22,16 +23,21 @@ describe('VBanner.ts', () => {
     mountFunction = (options = {}) => {
       return mount(VBanner, {
         ...options,
-        mocks: {
-          $vuetify: {
-            application: {
-              top: 0,
-              bar: 0,
-            },
-            breakpoint: {
-              mobile: true,
-              mobileBreakpoint: 1264,
-              width: 1000,
+        global: {
+          mocks: {
+            $vuetify: {
+              application: {
+                top: 0,
+                bar: 0,
+              },
+              breakpoint: {
+                mobile: true,
+                mobileBreakpoint: 1264,
+                width: 1000,
+              },
+              icons: {
+                component: null,
+              },
             },
           },
         },
@@ -67,7 +73,7 @@ describe('VBanner.ts', () => {
       slots: {
         default: 'Hello, World!',
       },
-      propsData: {
+      props: {
         icon: 'mdi-plus',
       },
     })
@@ -79,7 +85,7 @@ describe('VBanner.ts', () => {
     const wrapper = mountFunction({
       slots: {
         default: 'Hello, World!',
-        icon: { render: h => h('span', ['icon']) },
+        icon: () => h('span', ['icon']),
       },
     })
 
@@ -90,7 +96,7 @@ describe('VBanner.ts', () => {
     const wrapper = mountFunction({
       slots: {
         default: 'Hello, World!',
-        actions: { render: h => h('div', [h('button', ['OK']), h('button', ['Cancel'])]) },
+        actions: () => h('div', [h('button', ['OK']), h('button', ['Cancel'])]),
       },
     })
 
@@ -102,19 +108,16 @@ describe('VBanner.ts', () => {
       slots: {
         default: 'Hello, World!',
       },
-      propsData: {
+      props: {
         icon: 'mdi-plus',
       },
     })
 
-    const fn = jest.fn()
-    wrapper.vm.$on('click:icon', fn)
-
     const icon = wrapper.find('.v-banner__icon')
 
-    expect(fn).not.toHaveBeenCalled()
+    expect(wrapper.emitted('click:icon')).toBeFalsy()
     icon.trigger('click')
-    expect(fn).toHaveBeenCalled()
+    expect(wrapper.emitted('click:icon')).toBeTruthy()
   })
 
   it(`should not render icon container if icon property and slot aren't passed`, () => {
@@ -167,16 +170,10 @@ describe('VBanner.ts', () => {
     const wrapper = mountFunction({
       slots: {
         default: 'Hello, World!',
-      },
-      scopedSlots: {
-        actions (props) {
-          return h('div', {
-            on: {
-              click: props.dismiss,
-            },
-            class: 'test',
-          })
-        },
+        actions: ({ dismiss }) => h('div', {
+          onClick: dismiss,
+          class: 'test',
+        }),
       },
     })
 
@@ -191,9 +188,11 @@ describe('VBanner.ts', () => {
       slots: {
         default: 'Hello, World!',
       },
-      mocks: {
-        $vuetify: {
-          breakpoint: new Breakpoint(preset),
+      global: {
+        mocks: {
+          $vuetify: {
+            breakpoint: new Breakpoint(preset),
+          },
         },
       },
     })
@@ -201,16 +200,16 @@ describe('VBanner.ts', () => {
     expect(wrapper.classes('v-banner--is-mobile')).toBeTruthy()
   })
 
-  it('should apply sticky when using the app prop', () => {
+  it('should apply sticky when using the app prop', async () => {
     const wrapper = mountFunction({
-      propsData: { app: true },
+      props: { app: true },
     })
 
     expect(wrapper.vm.isSticky).toBe(true)
 
     expect(wrapper.html()).toMatchSnapshot()
 
-    wrapper.setProps({
+    await wrapper.setProps({
       app: false,
       sticky: true,
     })
@@ -219,7 +218,7 @@ describe('VBanner.ts', () => {
 
     expect(wrapper.html()).toMatchSnapshot()
 
-    wrapper.setProps({ sticky: false })
+    await wrapper.setProps({ app: false, sticky: false })
 
     expect(wrapper.vm.isSticky).toBe(false)
 

package/src/components/VBanner/__tests__/__snapshots__/VBanner.spec.ts.snap

@@ -114,7 +114,7 @@ exports[`VBanner.ts should render component with icon slot 1`] = `
 `;
 
 exports[`VBanner.ts should render sinle-line component with content 1`] = `
-<div class="v-banner v-sheet theme--light v-banner--is-mobile">
+<div class="v-banner v-sheet theme--light v-banner--is-mobile v-banner--single-line">
   <div class="v-banner__wrapper">
     <div class="v-banner__content">
       <div class="v-banner__text">

package/src/components/VBtn/__tests__/VBtn.spec.ts

@@ -99,7 +99,7 @@ describe('VBtn.ts', () => {
   it('should use custom active-class', () => {
     const wrapper = mountFunction({
       props: {
-        inputValue: true,
+        modelValue: true,
         activeClass: 'foo',
       },
     })

package/src/components/VCard/__tests__/VCard.spec.ts

@@ -1,21 +1,49 @@
 import {
   mount,
-  Wrapper,
-  MountOptions,
+  VueWrapper,
+  MountingOptions,
 } from '@vue/test-utils'
 import VCard from '../VCard'
-import { ExtractVue } from '../../../util/mixins'
 
 describe('VCard.vue', () => {
-  type Instance = ExtractVue<typeof VCard>
-  let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
+  type Instance = InstanceType<typeof VCard>
+  let mountFunction: (options?: MountingOptions<Instance>) => VueWrapper<Instance>
+
   beforeEach(() => {
-    mountFunction = (options?: MountOptions<Instance>) => {
-      return mount(VCard, {
-        // https://github.com/vuejs/vue-test-utils/issues/1130
-        sync: false,
+    mountFunction = (options?: MountingOptions<Instance>) => {
+      const defaultOptions = {
+        global: {
+          mocks: {
+            $vuetify: {
+              rtl: false,
+              lang: {
+                t: (val: string) => val,
+              },
+              icons: {
+                component: 'mdi',
+              },
+            },
+            $activeClass: 'v-card--active',
+          },
+        },
+        slots: {},
+      }
+
+      // Объединяем опции правильно
+      const mergedOptions = {
+        ...defaultOptions,
         ...options,
-      })
+        slots: {
+          ...defaultOptions.slots,
+          ...options?.slots,
+        },
+        global: {
+          ...defaultOptions.global,
+          ...options?.global,
+        },
+      }
+
+      return mount(VCard, mergedOptions)
     }
   })
 
@@ -27,14 +55,9 @@ describe('VCard.vue', () => {
 
   it('should render loading card', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         loading: true,
       },
-      mocks: {
-        $vuetify: {
-          rtl: false,
-        },
-      },
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -42,10 +65,8 @@ describe('VCard.vue', () => {
 
   it('should render card, which is link', () => {
     const wrapper = mountFunction({
-      // https://github.com/vuejs/vue-test-utils/issues/1130
-      sync: false,
-      listeners: {
-        click: () => {},
+      attrs: {
+        onClick: () => {},
       },
     })
 
@@ -54,7 +75,7 @@ describe('VCard.vue', () => {
 
   it('should render card with img', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         img: 'image.jpg',
       },
     })
@@ -64,7 +85,7 @@ describe('VCard.vue', () => {
 
   it('should render a flat card', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         flat: true,
       },
     })
@@ -74,7 +95,7 @@ describe('VCard.vue', () => {
 
   it('should render a raised card', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         raised: true,
       },
     })
@@ -85,9 +106,7 @@ describe('VCard.vue', () => {
   it('should render a card with custom height', async () => {
     const heightpx = '400px'
     const wrapper = mountFunction({
-      // https://github.com/vuejs/vue-test-utils/issues/1130
-      sync: false,
-      propsData: {
+      props: {
         height: heightpx,
       },
     })
@@ -95,10 +114,9 @@ describe('VCard.vue', () => {
     expect(wrapper.element.style.height).toBe(heightpx)
     expect(wrapper.html()).toMatchSnapshot()
 
-    wrapper.setProps({
+    await wrapper.setProps({
       height: 401,
     })
-    await wrapper.vm.$nextTick()
     expect(wrapper.element.style.height).toBe('401px')
   })
 })

package/src/components/VCard/__tests__/__snapshots__/VCard.spec.ts.snap

@@ -37,10 +37,10 @@ exports[`VCard.vue should render component and match snapshot 1`] = `
 exports[`VCard.vue should render loading card 1`] = `
 <div class="v-card v-card--loading v-sheet theme--light">
   <div class="v-card__progress">
-    <div role="progressbar"
+    <div class="v-progress-linear v-progress-linear--absolute v-progress-linear--visible theme--light"
+         role="progressbar"
          aria-valuemin="0"
          aria-valuemax="100"
-         class="v-progress-linear v-progress-linear--absolute v-progress-linear--visible theme--light"
          style="height: 4px;"
     >
       <div class="v-progress-linear__background primary"