Merge branch 'master' into bug/fix-types

Author: blimmer

src/__tests__/vue-router.js

@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom'
 import {render, fireEvent} from '@testing-library/vue'
+import VueRouter from 'vue-router'
 
 import App from './components/Router/App.vue'
 import Home from './components/Router/Home.vue'
@@ -32,3 +33,15 @@ test('setting initial route', () => {
 
   expect(getByTestId('location-display')).toHaveTextContent('/about')
 })
+
+test('can render with an instantiated Vuex store', async () => {
+  // Instantiate a router with only one route
+  const instantiatedRouter = new VueRouter({
+    routes: [{path: '/special-path', component: Home}],
+  })
+
+  render(App, {routes: instantiatedRouter}, (vue, store, router) => {
+    expect(router.getRoutes()).toHaveLength(1)
+    expect(router.getRoutes()[0].path).toEqual('/special-path')
+  })
+})

src/__tests__/vuex.js

@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom'
 import {render, fireEvent} from '@testing-library/vue'
+import Vuex from 'vuex'
 
 import VuexTest from './components/Store/VuexTest'
 import {store} from './components/Store/store'
@@ -54,3 +55,33 @@ test('can render with vuex with custom store', async () => {
   await fireEvent.click(getByText('-'))
   expect(getByTestId('count-value')).toHaveTextContent('1000')
 })
+
+test('can render with an instantiated Vuex store', async () => {
+  const {getByTestId, getByText} = render(VuexTest, {
+    store: new Vuex.Store({
+      state: {count: 3},
+      mutations: {
+        increment(state) {
+          state.count++
+        },
+        decrement(state) {
+          state.count--
+        },
+      },
+      actions: {
+        increment(context) {
+          context.commit('increment')
+        },
+        decrement(context) {
+          context.commit('decrement')
+        },
+      },
+    }),
+  })
+
+  await fireEvent.click(getByText('+'))
+  expect(getByTestId('count-value')).toHaveTextContent('4')
+
+  await fireEvent.click(getByText('-'))
+  expect(getByTestId('count-value')).toHaveTextContent('3')
+})

src/render.js

@@ -31,15 +31,15 @@ function render(
     const Vuex = require('vuex')
     localVue.use(Vuex)
 
-    vuexStore = new Vuex.Store(store)
+    vuexStore = store instanceof Vuex.Store ? store : new Vuex.Store(store)
   }
 
   if (routes) {
     const requiredRouter = require('vue-router')
     const VueRouter = requiredRouter.default || requiredRouter
     localVue.use(VueRouter)
 
-    router = new VueRouter({routes})
+    router = routes instanceof VueRouter ? routes : new VueRouter({routes})
   }
 
   if (configurationCb && typeof configurationCb === 'function') {

types/index.d.ts

@@ -41,7 +41,7 @@ export interface RenderOptions<V extends Vue, S = {}>
   extends Omit<ThisTypedMountOptions<V>, 'store' | 'props'> {
   props?: object
   store?: StoreOptions<S>
-  routes?: RouteConfig[]
+  routes?: RouteConfig[] | Router
   container?: Element
   baseElement?: Element
 }

types/test.ts

@@ -1,4 +1,6 @@
 import Vue from 'vue'
+import Vuex from 'vuex'
+import VueRouter from 'vue-router'
 import {render, fireEvent, screen, waitFor} from '@testing-library/vue'
 
 declare const elem: Element
@@ -127,6 +129,38 @@ export function testConfigCallback() {
   })
 }
 
+export function testInstantiatedStore() {
+  render(SomeComponent, {
+    store: new Vuex.Store({
+      state: {count: 3},
+      mutations: {
+        increment(state) {
+          state.count++
+        },
+        decrement(state) {
+          state.count--
+        },
+      },
+      actions: {
+        increment(context) {
+          context.commit('increment')
+        },
+        decrement(context) {
+          context.commit('decrement')
+        },
+      },
+    }),
+  })
+}
+
+export function testInstantiatedRouter() {
+  render(SomeComponent, {
+    routes: new VueRouter({
+      routes: [{path: '/', name: 'home', component: SomeComponent}],
+    }),
+  })
+}
+
 /*
 eslint
   testing-library/prefer-explicit-assert: "off",