From 3a52978608e08417c652af5b894a4f8f9bda8ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Fontcuberta?= <afontcu@gmail.com>
Date: Fri, 8 Jan 2021 11:11:50 +0100
Subject: [PATCH 1/2] Do not mount component again on rerender

---
 src/__tests__/rerender.js | 23 +++++++++++-----------
 src/index.js              | 41 ++++++++++++++-------------------------
 2 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/__tests__/rerender.js b/src/__tests__/rerender.js
index d72dc1b6..490635fc 100644
--- a/src/__tests__/rerender.js
+++ b/src/__tests__/rerender.js
@@ -7,25 +7,24 @@ import NumberDisplay from './components/NumberDisplay'
 // to ensure that the rerendered component is being updated correctly.
 // That said, if you'd prefer to, for example, update the props of a rendered
 // component, this function can be used to do so.
-test('calling rerender remounts the component and updates the props', () => {
+test('rerender re-renders the element', async () => {
   const {rerender, getByTestId} = render(NumberDisplay, {
     props: {number: 1},
   })
 
   expect(getByTestId('number-display')).toHaveTextContent('1')
 
-  rerender({props: {number: 3}})
+  await rerender({number: 3})
   expect(getByTestId('number-display')).toHaveTextContent('3')
 
-  rerender({props: {number: 5}})
+  await rerender({number: 5})
   expect(getByTestId('number-display')).toHaveTextContent('5')
 
-  // Assert that, after rerendering and updating props, the component has been remounted,
-  // meaning we are testing a different component instance than we rendered initially.
-  expect(getByTestId('instance-id')).toHaveTextContent('3')
+  // Notice we don't remount a different instance
+  expect(getByTestId('instance-id')).toHaveTextContent('1')
 })
 
-test('rerender works with composition API', () => {
+test('rerender works with composition API', async () => {
   const Component = defineComponent({
     props: {
       foo: {type: String, default: 'foo'},
@@ -43,11 +42,11 @@ test('rerender works with composition API', () => {
 
   const {rerender, getByTestId} = render(Component)
 
-  const originalNode = getByTestId('node')
-  expect(originalNode).toHaveTextContent('Foo is: foo. Foobar is: foo-bar')
+  const getContent = () => getByTestId('node')
 
-  rerender({props: {foo: 'qux'}})
+  expect(getContent()).toHaveTextContent('Foo is: foo. Foobar is: foo-bar')
 
-  const newNode = getByTestId('node')
-  expect(newNode).toHaveTextContent('Foo is: qux. Foobar is: qux-bar')
+  await rerender({foo: 'qux'})
+
+  expect(getContent()).toHaveTextContent('Foo is: qux. Foobar is: qux-bar')
 })
diff --git a/src/index.js b/src/index.js
index e9b0ff9c..dcf1dbcb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -12,7 +12,7 @@ import {
 const mountedWrappers = new Set()
 
 function render(
-  TestComponent,
+  Component,
   {
     store = null,
     routes = null,
@@ -25,7 +25,7 @@ function render(
   const baseElement = customBaseElement || customContainer || document.body
   const container = customContainer || baseElement.appendChild(div)
 
-  const plugins = []
+  const plugins = mountOptions.global?.plugins || []
 
   if (store) {
     const {createStore} = require('vuex')
@@ -41,26 +41,20 @@ function render(
     plugins.push(routerPlugin)
   }
 
-  const mountComponent = (Component, newProps) => {
-    const wrapper = mount(
-      Component,
-      merge({
-        attachTo: container,
-        global: {plugins},
-        ...mountOptions,
-        props: newProps || mountOptions.props,
-      }),
-    )
-
-    // this removes the additional "data-v-app" div node from VTU:
-    // https://github.com/vuejs/vue-test-utils-next/blob/master/src/mount.ts#L196-L213
-    unwrapNode(wrapper.parentElement)
+  const wrapper = mount(
+    Component,
+    merge({
+      attachTo: container,
+      global: {plugins},
+      ...mountOptions,
+    }),
+  )
 
-    mountedWrappers.add(wrapper)
-    return wrapper
-  }
+  // this removes the additional "data-v-app" div node from VTU:
+  // https://github.com/vuejs/vue-test-utils-next/blob/master/src/mount.ts#L196-L213
+  unwrapNode(wrapper.parentElement)
 
-  let wrapper = mountComponent(TestComponent)
+  mountedWrappers.add(wrapper)
 
   return {
     container,
@@ -72,12 +66,7 @@ function render(
     unmount: () => wrapper.unmount(),
     html: () => wrapper.html(),
     emitted: () => wrapper.emitted(),
-    rerender: ({props}) => {
-      wrapper.unmount()
-      mountedWrappers.delete(wrapper)
-
-      wrapper = mountComponent(TestComponent, props)
-    },
+    rerender: props => wrapper.setProps(props),
     ...getQueriesForElement(baseElement),
   }
 }

From 0c1bff6f6eed1aff3a14dbde52db94f45abaa027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Fontcuberta?= <afontcu@gmail.com>
Date: Fri, 8 Jan 2021 11:16:36 +0100
Subject: [PATCH 2/2] Remove leftover

---
 src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.js b/src/index.js
index dcf1dbcb..fca58e3f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -25,7 +25,7 @@ function render(
   const baseElement = customBaseElement || customContainer || document.body
   const container = customContainer || baseElement.appendChild(div)
 
-  const plugins = mountOptions.global?.plugins || []
+  const plugins = []
 
   if (store) {
     const {createStore} = require('vuex')