From 59331e9ce64eb4531cd2735871eaff03ae69444b Mon Sep 17 00:00:00 2001
From: Lachlan Miller <lachlan.miller.1990@outlook.com>
Date: Sun, 13 Nov 2022 19:10:52 +1000
Subject: [PATCH 1/6] chore: publish 2.2.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 946ca79f7..fc5530590 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/test-utils",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "license": "MIT",
   "main": "dist/vue-test-utils.cjs.js",
   "unpkg": "dist/vue-test-utils.browser.js",

From f2dd6125e6b7ca1bcee50e01c722ee8b38fcbbc6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 15:19:55 +0000
Subject: [PATCH 2/6] chore(deps): update vitest to v0.25.2

---
 package.json   |  4 ++--
 pnpm-lock.yaml | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index fc5530590..2828cfbfb 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "@typescript-eslint/parser": "5.42.1",
     "@vitejs/plugin-vue": "3.2.0",
     "@vitejs/plugin-vue-jsx": "2.1.1",
-    "@vitest/coverage-c8": "0.25.1",
+    "@vitest/coverage-c8": "0.25.2",
     "@vue/compat": "3.2.45",
     "@vue/compiler-dom": "3.2.45",
     "@vue/compiler-sfc": "3.2.45",
@@ -55,7 +55,7 @@
     "unplugin-vue-components": "0.22.9",
     "vite": "3.2.3",
     "vitepress": "0.22.4",
-    "vitest": "0.25.1",
+    "vitest": "0.25.2",
     "vue": "3.2.45",
     "vue-class-component": "8.0.0-rc.1",
     "vue-router": "4.1.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 25234443c..4557ee62b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,7 +12,7 @@ specifiers:
   '@typescript-eslint/parser': 5.42.1
   '@vitejs/plugin-vue': 3.2.0
   '@vitejs/plugin-vue-jsx': 2.1.1
-  '@vitest/coverage-c8': 0.25.1
+  '@vitest/coverage-c8': 0.25.2
   '@vue/compat': 3.2.45
   '@vue/compiler-dom': 3.2.45
   '@vue/compiler-sfc': 3.2.45
@@ -34,7 +34,7 @@ specifiers:
   unplugin-vue-components: 0.22.9
   vite: 3.2.3
   vitepress: 0.22.4
-  vitest: 0.25.1
+  vitest: 0.25.2
   vue: 3.2.45
   vue-class-component: 8.0.0-rc.1
   vue-router: 4.1.6
@@ -53,7 +53,7 @@ devDependencies:
   '@typescript-eslint/parser': 5.42.1_rmayb2veg2btbq6mbmnyivgasy
   '@vitejs/plugin-vue': 3.2.0_vite@3.2.3+vue@3.2.45
   '@vitejs/plugin-vue-jsx': 2.1.1_vite@3.2.3+vue@3.2.45
-  '@vitest/coverage-c8': 0.25.1_jsdom@20.0.2
+  '@vitest/coverage-c8': 0.25.2_jsdom@20.0.2
   '@vue/compat': 3.2.45_vue@3.2.45
   '@vue/compiler-dom': 3.2.45
   '@vue/compiler-sfc': 3.2.45
@@ -75,7 +75,7 @@ devDependencies:
   unplugin-vue-components: 0.22.9_rollup@3.2.5+vue@3.2.45
   vite: 3.2.3_@types+node@18.11.9
   vitepress: 0.22.4
-  vitest: 0.25.1_jsdom@20.0.2
+  vitest: 0.25.2_jsdom@20.0.2
   vue: 3.2.45
   vue-class-component: 8.0.0-rc.1_vue@3.2.45
   vue-router: 4.1.6_vue@3.2.45
@@ -962,11 +962,11 @@ packages:
       vue: 3.2.45
     dev: true
 
-  /@vitest/coverage-c8/0.25.1_jsdom@20.0.2:
-    resolution: {integrity: sha512-gpl5QNaNeIN0mfRiosCqBFoZcizb5GA458TDnOQXkGDc4kklazxn70u9evGfV62wiiAUfGGebgRhxlBkAa6m6g==}
+  /@vitest/coverage-c8/0.25.2_jsdom@20.0.2:
+    resolution: {integrity: sha512-qKsiUJh3bjbB5Q229CbxEWCqiDBwvIrcZ9OOuQdMEC0pce3/LlTUK3+K3hd7WqAYEbbiqXfC5MVMKHZkV82PgA==}
     dependencies:
       c8: 7.12.0
-      vitest: 0.25.1_jsdom@20.0.2
+      vitest: 0.25.2_jsdom@20.0.2
     transitivePeerDependencies:
       - '@edge-runtime/vm'
       - '@vitest/browser'
@@ -3714,8 +3714,8 @@ packages:
       - stylus
     dev: true
 
-  /vitest/0.25.1_jsdom@20.0.2:
-    resolution: {integrity: sha512-eH74h6MkuEgsqR4mAQZeMK9O0PROiKY+i+1GMz/fBi5A3L2ml5U7JQs7LfPU7+uWUziZyLHagl+rkyfR8SLhlA==}
+  /vitest/0.25.2_jsdom@20.0.2:
+    resolution: {integrity: sha512-qqkzfzglEFbQY7IGkgSJkdOhoqHjwAao/OrphnHboeYHC5JzsVFoLCaB2lnAy8krhj7sbrFTVRApzpkTOeuDWQ==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     peerDependencies:

From 87625ec6361b4c1d41c7047680b5a5cc03f6251c Mon Sep 17 00:00:00 2001
From: ced <cedric@ninja-squad.com>
Date: Mon, 14 Nov 2022 12:05:29 +0100
Subject: [PATCH 3/6] fix: allow spying on non-exposed script setup functions

Fixes #1859

The proxy needs to implement `defineProperty` to allow spying.
---
 src/vueWrapper.ts                | 17 +++++++++++++++++
 tests/components/ScriptSetup.vue |  2 +-
 tests/expose.spec.ts             | 17 ++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/vueWrapper.ts b/src/vueWrapper.ts
index 3ecd81263..5034a4405 100644
--- a/src/vueWrapper.ts
+++ b/src/vueWrapper.ts
@@ -45,12 +45,29 @@ function createVMProxy<T extends ComponentPublicInstance>(
         return Reflect.set(vm, key, value, receiver)
       }
     },
+    has(vm, property) {
+      return Reflect.has(setupState, property) || Reflect.has(vm, property)
+    },
+    defineProperty(vm, key, attributes) {
+      if (key in setupState) {
+        return Reflect.defineProperty(setupState, key, attributes)
+      } else {
+        return Reflect.defineProperty(vm, key, attributes)
+      }
+    },
     getOwnPropertyDescriptor(vm, property) {
       if (property in setupState) {
         return Reflect.getOwnPropertyDescriptor(setupState, property)
       } else {
         return Reflect.getOwnPropertyDescriptor(vm, property)
       }
+    },
+    deleteProperty(vm, property) {
+      if (property in setupState) {
+        return Reflect.deleteProperty(setupState, property)
+      } else {
+        return Reflect.deleteProperty(vm, property)
+      }
     }
   })
 }
diff --git a/tests/components/ScriptSetup.vue b/tests/components/ScriptSetup.vue
index d79d16ab5..48402e806 100644
--- a/tests/components/ScriptSetup.vue
+++ b/tests/components/ScriptSetup.vue
@@ -12,6 +12,6 @@ const inc = () => {
 </script>
 
 <template>
-  <button @click="inc">{{ count }}</button>
+  <button @click="inc()">{{ count }}</button>
   <Hello />
 </template>
diff --git a/tests/expose.spec.ts b/tests/expose.spec.ts
index 2b09247bf..7ff5528ef 100644
--- a/tests/expose.spec.ts
+++ b/tests/expose.spec.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { mount } from '../src'
 import Hello from './components/Hello.vue'
@@ -61,4 +61,19 @@ describe('expose', () => {
     await nextTick()
     expect(wrapper.html()).toContain('2')
   })
+
+  it('spies on vm with <script setup> even without defineExpose()', async () => {
+    const wrapper = mount(ScriptSetup)
+
+    const spiedIncrement = vi
+      // @ts-ignore we need better types here, see https://github.com/vuejs/test-utils/issues/972
+      .spyOn(wrapper.vm, 'inc')
+      .mockImplementation(() => {})
+
+    await wrapper.find('button').trigger('click')
+    await nextTick()
+
+    expect(spiedIncrement).toHaveBeenCalled()
+    expect(wrapper.html()).toContain('0')
+  })
 })

From bf1fbe997d47c72058ea38097b96f02abae3e1b3 Mon Sep 17 00:00:00 2001
From: ced <cedric@ninja-squad.com>
Date: Mon, 14 Nov 2022 16:56:31 +0100
Subject: [PATCH 4/6] fix: expose props on vm for script setup components

Fixes #1863

It turns out `vm` is not enough, and we need to proxy to `vm.$.ctx` which contains the props as well.
---
 src/vueWrapper.ts                         |  4 +++-
 tests/components/ScriptSetupWithProps.vue | 13 +++++++++++++
 tests/expose.spec.ts                      | 15 +++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 tests/components/ScriptSetupWithProps.vue

diff --git a/src/vueWrapper.ts b/src/vueWrapper.ts
index 5034a4405..6995c7d66 100644
--- a/src/vueWrapper.ts
+++ b/src/vueWrapper.ts
@@ -35,7 +35,9 @@ function createVMProxy<T extends ComponentPublicInstance>(
       if (key in setupState) {
         return Reflect.get(setupState, key, receiver)
       } else {
-        return (vm as any)[key]
+        // vm.$.ctx is the internal context of the vm
+        // with all variables, methods and props
+        return (vm as any).$.ctx[key]
       }
     },
     set(vm, key, value, receiver) {
diff --git a/tests/components/ScriptSetupWithProps.vue b/tests/components/ScriptSetupWithProps.vue
new file mode 100644
index 000000000..8a2b1c09f
--- /dev/null
+++ b/tests/components/ScriptSetupWithProps.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+
+const props = defineProps<{ count: number }>()
+const internalCount = ref(props.count);
+const inc = () => {
+  internalCount.value++
+}
+</script>
+
+<template>
+  <button @click="inc">{{ internalCount }}</button>
+</template>
diff --git a/tests/expose.spec.ts b/tests/expose.spec.ts
index 7ff5528ef..16364149d 100644
--- a/tests/expose.spec.ts
+++ b/tests/expose.spec.ts
@@ -6,6 +6,7 @@ import DefineExpose from './components/DefineExpose.vue'
 import DefineExposeWithRenderFunction from './components/DefineExposeWithRenderFunction.vue'
 import ScriptSetupExpose from './components/ScriptSetup_Expose.vue'
 import ScriptSetup from './components/ScriptSetup.vue'
+import ScriptSetupWithProps from './components/ScriptSetupWithProps.vue'
 
 describe('expose', () => {
   it('access vm on simple components', async () => {
@@ -76,4 +77,18 @@ describe('expose', () => {
     expect(spiedIncrement).toHaveBeenCalled()
     expect(wrapper.html()).toContain('0')
   })
+
+  it('access props on vm with <script setup>', async () => {
+    const wrapper = mount(ScriptSetupWithProps, {
+      props: {
+        count: 2
+      }
+    })
+    // make sure that props are accessible on wrapper.vm
+    expect(wrapper.vm.count).toBe(2)
+    expect(wrapper.html()).toContain('2')
+
+    await wrapper.find('button').trigger('click')
+    expect(wrapper.html()).toContain('3')
+  })
 })

From 9a256db6bb3ea4624ac5fbb49f84b1429fb1b038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Exbrayat?=
 <cexbrayat@users.noreply.github.com>
Date: Tue, 15 Nov 2022 09:33:59 +0100
Subject: [PATCH 5/6] fix: allow mocking on script setup components (#1861)

We need to differentiate how the mixin used for mocking updates the isntance,
as Vue v3.2.45 now forbids to update directly a script setup component from a component written with the Options API.

Fixes the error `set' on proxy: trap returned falsish for property`

This comes from the fact that mocks are set via a mixin (Options API) and we run into the more strict behavior of Vue v3.2.45
introduced in https://github.com/vuejs/core/commit/f73925d76a76ee259749b8b48cb68895f539a00f#diff-ea4d1ddabb7e22e17e80ada458eef70679af4005df2a1a6b73418fec897603ceR404
---
 src/mount.ts         | 15 ++++++++++++---
 src/utils.ts         |  9 +++++++++
 src/vueWrapper.ts    |  7 ++-----
 tests/expose.spec.ts | 19 +++++++++++++++++++
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/mount.ts b/src/mount.ts
index 0bfd45f24..a991814d6 100644
--- a/src/mount.ts
+++ b/src/mount.ts
@@ -33,6 +33,7 @@ import { MountingOptions, Slot } from './types'
 import {
   getComponentsFromStubs,
   getDirectivesFromStubs,
+  hasSetupState,
   isFunctionalComponent,
   isObject,
   isObjectComponent,
@@ -475,15 +476,23 @@ export function mount(
 
   // global mocks mixin
   if (global?.mocks) {
-    const mixin = {
+    const mixin = defineComponent({
       beforeCreate() {
         for (const [k, v] of Object.entries(
           global.mocks as { [key: string]: any }
         )) {
-          ;(this as any)[k] = v
+          // we need to differentiate components that are or not not `script setup`
+          // otherwise we run into a proxy set error
+          // due to https://github.com/vuejs/core/commit/f73925d76a76ee259749b8b48cb68895f539a00f#diff-ea4d1ddabb7e22e17e80ada458eef70679af4005df2a1a6b73418fec897603ceR404
+          // introduced in Vue v3.2.45
+          if (hasSetupState(this as any)) {
+            ;(this as any).$.setupState[k] = v
+          } else {
+            ;(this as any)[k] = v
+          }
         }
       }
-    }
+    })
 
     app.mixin(mixin)
   }
diff --git a/src/utils.ts b/src/utils.ts
index 0a9c49564..e2780518f 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -2,6 +2,7 @@ import { GlobalMountOptions, RefSelector, Stub, Stubs } from './types'
 import {
   Component,
   ComponentOptions,
+  ComponentPublicInstance,
   ConcreteComponent,
   Directive,
   FunctionalComponent
@@ -185,3 +186,11 @@ export function getDirectivesFromStubs(
       .map(([key, value]) => [key.substring(1), value])
   ) as Record<string, Directive>
 }
+export function hasSetupState(
+  vm: ComponentPublicInstance
+): vm is ComponentPublicInstance & { setupState: Record<string, unknown> } {
+  return (
+    vm &&
+    (vm.$ as unknown as { devtoolsRawSetupState: any }).devtoolsRawSetupState
+  )
+}
diff --git a/src/vueWrapper.ts b/src/vueWrapper.ts
index 6995c7d66..356ae09d9 100644
--- a/src/vueWrapper.ts
+++ b/src/vueWrapper.ts
@@ -8,7 +8,7 @@ import {
 import { config } from './config'
 import domEvents from './constants/dom-events'
 import { VueElement, VueNode } from './types'
-import { mergeDeep } from './utils'
+import { hasSetupState, mergeDeep } from './utils'
 import { getRootNodes } from './utils/getRootNodes'
 import { emitted, recordEvent, removeEventHistory } from './emit'
 import BaseWrapper from './baseWrapper'
@@ -107,10 +107,7 @@ export class VueWrapper<
     // This does not work for functional components though (as they have no vm)
     // or for components with a setup that returns a render function (as they have an empty proxy)
     // in both cases, we return `vm` directly instead
-    if (
-      vm &&
-      (vm.$ as unknown as { devtoolsRawSetupState: any }).devtoolsRawSetupState
-    ) {
+    if (hasSetupState(vm)) {
       this.componentVM = createVMProxy<T>(vm, (vm.$ as any).setupState)
     } else {
       this.componentVM = vm
diff --git a/tests/expose.spec.ts b/tests/expose.spec.ts
index 16364149d..357d4000b 100644
--- a/tests/expose.spec.ts
+++ b/tests/expose.spec.ts
@@ -91,4 +91,23 @@ describe('expose', () => {
     await wrapper.find('button').trigger('click')
     expect(wrapper.html()).toContain('3')
   })
+
+  it('should not throw when mocking', async () => {
+    const spiedIncrement = vi.fn()
+    const wrapper = mount(ScriptSetup, {
+      global: {
+        mocks: {
+          count: -1,
+          inc: spiedIncrement
+        }
+      }
+    })
+    expect(wrapper.html()).toContain('-1')
+
+    await wrapper.find('button').trigger('click')
+    await nextTick()
+
+    expect(spiedIncrement).toHaveBeenCalled()
+    expect(wrapper.html()).toContain('-1')
+  })
 })

From a091420bf2aa8855e39b10d2b8ba792d15840f11 Mon Sep 17 00:00:00 2001
From: Lachlan Miller <lachlan.miller.1990@outlook.com>
Date: Tue, 15 Nov 2022 18:35:04 +1000
Subject: [PATCH 6/6] publish: 2.2.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2828cfbfb..ea432180b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/test-utils",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "license": "MIT",
   "main": "dist/vue-test-utils.cjs.js",
   "unpkg": "dist/vue-test-utils.browser.js",