From b6bcf468156c77a5e75f1615968a894d686e83e9 Mon Sep 17 00:00:00 2001
From: Alberto Gualis <agualis@gmail.com>
Date: Fri, 13 Mar 2020 17:49:41 +0100
Subject: [PATCH 1/4] fix(#119): allow routes vue-router creation through
 routes param from both jest and mocha

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

diff --git a/src/vue-testing-library.js b/src/vue-testing-library.js
index 3dbabde4..3aa4041d 100644
--- a/src/vue-testing-library.js
+++ b/src/vue-testing-library.js
@@ -36,7 +36,7 @@ function render(
   }
 
   if (routes) {
-    const VueRouter = require('vue-router')
+    const VueRouter = require('vue-router') || require('vue-router').default
     localVue.use(VueRouter)
     router = new VueRouter({
       routes,

From 47168efba57979c347b25c3baaf2dc304871297e Mon Sep 17 00:00:00 2001
From: Alberto Gualis <agualis@gmail.com>
Date: Tue, 17 Mar 2020 10:01:14 +0100
Subject: [PATCH 2/4] add test to check vue-router require for mocha users

---
 src/__tests__/vue-router-mocha.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/__tests__/vue-router-mocha.js

diff --git a/src/__tests__/vue-router-mocha.js b/src/__tests__/vue-router-mocha.js
new file mode 100644
index 00000000..6cb0fa4f
--- /dev/null
+++ b/src/__tests__/vue-router-mocha.js
@@ -0,0 +1,16 @@
+import '@testing-library/jest-dom'
+import {render} from '@testing-library/vue'
+
+import About from './components/Router/About.vue'
+
+const routes = []
+test('uses require("vue-router").default when require("vue-router") is undefined (useful for mocha users)', () => {
+  // Test for fix https://github.com/testing-library/vue-testing-library/issues/119
+  jest.mock('vue-router', () => {
+    return undefined
+  })
+
+  expect(() => render(About, {routes})).toThrowError(
+    new TypeError("Cannot read property 'default' of undefined"),
+  )
+})

From 872b282d1afdfc20492430a784c862a52199c860 Mon Sep 17 00:00:00 2001
From: Alberto Gualis <agualis@gmail.com>
Date: Wed, 18 Mar 2020 11:47:37 +0100
Subject: [PATCH 3/4] fix Vue Router require to be compatible with CommonJS

---
 src/vue-testing-library.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vue-testing-library.js b/src/vue-testing-library.js
index 3aa4041d..52993f78 100644
--- a/src/vue-testing-library.js
+++ b/src/vue-testing-library.js
@@ -36,7 +36,8 @@ function render(
   }
 
   if (routes) {
-    const VueRouter = require('vue-router') || require('vue-router').default
+    const requiredRouter = require('vue-router')
+    const VueRouter = requiredRouter.default || requiredRouter
     localVue.use(VueRouter)
     router = new VueRouter({
       routes,

From 4ebf064571877bab5c7086469cf2e9e60f823e07 Mon Sep 17 00:00:00 2001
From: Alberto Gualis <agualis@gmail.com>
Date: Wed, 18 Mar 2020 11:50:03 +0100
Subject: [PATCH 4/4] delete deprecated test

---
 src/__tests__/vue-router-mocha.js | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 src/__tests__/vue-router-mocha.js

diff --git a/src/__tests__/vue-router-mocha.js b/src/__tests__/vue-router-mocha.js
deleted file mode 100644
index 6cb0fa4f..00000000
--- a/src/__tests__/vue-router-mocha.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import '@testing-library/jest-dom'
-import {render} from '@testing-library/vue'
-
-import About from './components/Router/About.vue'
-
-const routes = []
-test('uses require("vue-router").default when require("vue-router") is undefined (useful for mocha users)', () => {
-  // Test for fix https://github.com/testing-library/vue-testing-library/issues/119
-  jest.mock('vue-router', () => {
-    return undefined
-  })
-
-  expect(() => render(About, {routes})).toThrowError(
-    new TypeError("Cannot read property 'default' of undefined"),
-  )
-})