From f69bc37a35aa88606b98c22bbfac79dc0e8072e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Exbrayat?=
 <cexbrayat@users.noreply.github.com>
Date: Mon, 5 Dec 2022 00:35:44 +0100
Subject: [PATCH 1/2] fix: allow to use KeepAlive or keep-alive in stubs
 (#1892)

* fix: allow to use KeepAlive or keep-alive in stubs

* refactor: use isTeleport/isKeepAlive utils in stubs
---
 .../stubComponentsTransformer.ts              | 11 +++--
 src/vnodeTransformers/util.ts                 |  4 +-
 tests/mountingOptions/global.stubs.spec.ts    | 48 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/vnodeTransformers/stubComponentsTransformer.ts b/src/vnodeTransformers/stubComponentsTransformer.ts
index 7a509c37b..d2d44e973 100644
--- a/src/vnodeTransformers/stubComponentsTransformer.ts
+++ b/src/vnodeTransformers/stubComponentsTransformer.ts
@@ -1,4 +1,4 @@
-import type { VTUVNodeTypeTransformer } from './util'
+import { isKeepAlive, isTeleport, VTUVNodeTypeTransformer } from './util'
 import {
   Transition,
   TransitionGroup,
@@ -115,7 +115,7 @@ export function createStubComponentsTransformer({
 }: CreateStubComponentsTransformerConfig): VTUVNodeTypeTransformer {
   return function componentsTransformer(type, instance) {
     // stub teleport by default via config.global.stubs
-    if ((type as any) === Teleport && 'teleport' in stubs) {
+    if (isTeleport(type) && 'teleport' in stubs) {
       if (stubs.teleport === false) return type
 
       return createStub({
@@ -125,9 +125,10 @@ export function createStubComponentsTransformer({
       })
     }
 
-    // stub keep-alive by default via config.global.stubs
-    if ((type as any) === KeepAlive && 'keep-alive' in stubs) {
-      if (stubs['keep-alive'] === false) return type
+    // stub keep-alive/KeepAlive by default via config.global.stubs
+    if (isKeepAlive(type) && ('keep-alive' in stubs || 'KeepAlive' in stubs)) {
+      if ('keep-alive' in stubs && stubs['keep-alive'] === false) return type
+      if ('KeepAlive' in stubs && stubs['KeepAlive'] === false) return type
 
       return createStub({
         name: 'keep-alive',
diff --git a/src/vnodeTransformers/util.ts b/src/vnodeTransformers/util.ts
index d9e5f98ee..c79bccd86 100644
--- a/src/vnodeTransformers/util.ts
+++ b/src/vnodeTransformers/util.ts
@@ -20,8 +20,8 @@ export type VTUVNodeTypeTransformer = (
   instance: InstanceArgsType
 ) => VNodeTransformerInputComponentType
 
-const isTeleport = (type: any): boolean => type.__isTeleport
-const isKeepAlive = (type: any): boolean => type.__isKeepAlive
+export const isTeleport = (type: any): boolean => type.__isTeleport
+export const isKeepAlive = (type: any): boolean => type.__isKeepAlive
 
 export const createVNodeTransformer = ({
   transformers
diff --git a/tests/mountingOptions/global.stubs.spec.ts b/tests/mountingOptions/global.stubs.spec.ts
index df03675dd..2712cdb36 100644
--- a/tests/mountingOptions/global.stubs.spec.ts
+++ b/tests/mountingOptions/global.stubs.spec.ts
@@ -563,7 +563,7 @@ describe('mounting options: stubs', () => {
       expect(wrapper.html()).toBe('<div id="content"></div>')
     })
 
-    it('opts in to stubbing keep-alive ', () => {
+    it('opts in to stubbing keep-alive with keep-alive: true', () => {
       const spy = vi.spyOn(console, 'warn')
       const Comp = {
         template: `<keep-alive><div id="content" /></keep-alive>`
@@ -586,6 +586,52 @@ describe('mounting options: stubs', () => {
       expect(spy).not.toHaveBeenCalled()
     })
 
+    it('opts in to stubbing KeepAlive with KeepAlive: true', () => {
+      const spy = vi.spyOn(console, 'warn')
+      const Comp = {
+        template: `<KeepAlive><div id="content" /></KeepAlive>`
+      }
+      const wrapper = mount(Comp, {
+        global: {
+          stubs: {
+            KeepAlive: true
+          }
+        }
+      })
+
+      expect(wrapper.html()).toBe(
+        '<keep-alive-stub>\n' +
+          '  <div id="content"></div>\n' +
+          '</keep-alive-stub>'
+      )
+      // Make sure that we don't have a warning when stubbing keep-alive
+      // https://github.com/vuejs/test-utils/issues/1888
+      expect(spy).not.toHaveBeenCalled()
+    })
+
+    it('opts in to stubbing keep-alive with KeepAlive: true', () => {
+      const spy = vi.spyOn(console, 'warn')
+      const Comp = {
+        template: `<keep-alive><div id="content" /></keep-alive>`
+      }
+      const wrapper = mount(Comp, {
+        global: {
+          stubs: {
+            KeepAlive: true
+          }
+        }
+      })
+
+      expect(wrapper.html()).toBe(
+        '<keep-alive-stub>\n' +
+          '  <div id="content"></div>\n' +
+          '</keep-alive-stub>'
+      )
+      // Make sure that we don't have a warning when stubbing keep-alive
+      // https://github.com/vuejs/test-utils/issues/1888
+      expect(spy).not.toHaveBeenCalled()
+    })
+
     it('does not stub keep-alive with shallow', () => {
       const Comp = {
         template: `<keep-alive><div id="content" /></keep-alive>`

From 92d510644649b79742440a957126b62672a6cc40 Mon Sep 17 00:00:00 2001
From: Lachlan Miller <lachlan.miller.1990@outlook.com>
Date: Mon, 5 Dec 2022 14:01:28 +1000
Subject: [PATCH 2/2] publish: 2.2.6

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

diff --git a/package.json b/package.json
index f9c12dd4a..94614f1c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/test-utils",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "license": "MIT",
   "main": "dist/vue-test-utils.cjs.js",
   "unpkg": "dist/vue-test-utils.browser.js",

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/vuejs/test-utils/compare/v2.2.5...v2.2.6.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/vuejs/test-utils/compare/v2.2.5...v2.2.6.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/vuejs/test-utils/compare/v2.2.5...v2.2.6.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/vuejs/test-utils/compare/v2.2.5...v2.2.6.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>