Merge 27b279b into 7f3dd2b

tjw-lint · Apr 21, 2020 · 235b126 · 235b126
2 parents 7f3dd2b + 27b279b
commit 235b126
Show file tree

Hide file tree

Showing 16 changed files with 390 additions and 353 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,8 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@vue/test-utils": "^1.0.0-beta.33",
+    "@lmiller1990/vue-test-utils-next": "next",
+    "@vue/compiler-sfc": "latest",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^25.4.0",
@@ -36,10 +37,10 @@
     "eslint-plugin-jsdoc": "^24.0.0",
     "eslint-plugin-vue": "^6.2.2",
     "jest": "24.9.0",
-    "vue": "^2.6.11",
+    "typescript": "^3.8.3",
+    "vue": "next",
     "vue-good-table": "^2.19.1",
-    "vue-jest": "^3.0.5",
-    "vue-template-compiler": "^2.6.11"
+    "vue-jest": "5.0.0-alpha.0"
   },
   "repository": {
     "type": "git",

diff --git a/tests/AllVNodeManipulations.test.js b/tests/AllVNodeManipulations.test.js
@@ -1,8 +1,10 @@
 const helpers = require('./helpers.js');
 
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import AllVNodeManipulations from './components/AllVNodeManipulations.vue';
 
+const shallowMount = mount;
+
 describe('AllVNodeManipulations.vue', () => {
   test('Attribute and input value shown', () => {
     helpers.mockSettings({

diff --git a/tests/AttributesToClear.test.js b/tests/AttributesToClear.test.js
@@ -1,8 +1,10 @@
 const helpers = require('./helpers.js');
 
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import AttributesToClear from './components/AttributesToClear.vue';
 
+const shallowMount = mount;
+
 describe('AttributesToClear.vue', () => {
   test('Default snapshot', () => {
     helpers.mockSettings({ removeDataTest: false });

diff --git a/tests/Empty.test.js b/tests/Empty.test.js
@@ -1,8 +1,10 @@
 const helpers = require('./helpers.js');
 
-import { mount, shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import Empty from './components/Empty.vue';
 
+const shallowMount = mount;
+
 describe('Empty.vue', () => {
   beforeEach(() => {
     helpers.mockSettings({});

diff --git a/tests/InputValue.test.js b/tests/InputValue.test.js
@@ -1,8 +1,10 @@
 const helpers = require('./helpers.js');
 
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import InputValue from './components/InputValue.vue';
 
+const shallowMount = mount;
+
 describe('InputValue.vue', () => {
   test('Value shown in snapshot', () => {
     helpers.mockSettings({ addInputValues: true });

diff --git a/tests/List.test.js b/tests/List.test.js
@@ -1,8 +1,10 @@
 const helpers = require('./helpers.js');
 
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import List from './components/List.vue';
 
+const shallowMount = mount;
+
 describe('List.vue', () => {
   test('Snapshot unchanged', () => {
     helpers.mockSettings({});

diff --git a/tests/ListSpaced.test.js b/tests/ListSpaced.test.js
@@ -1,8 +1,10 @@
 const helpers = require('./helpers.js');
 
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import ListSpaced from './components/ListSpaced.vue';
 
+const shallowMount = mount;
+
 describe('ListSpaced.vue', () => {
   test('Snapshot unchanged', () => {
     helpers.mockSettings({});

diff --git a/tests/ObjectAttribute.test.js b/tests/ObjectAttribute.test.js
@@ -1,8 +1,10 @@
 const helpers = require('./helpers.js');
 
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import ObjectAttribute from './components/ObjectAttribute.vue';
 
+const shallowMount = mount;
+
 describe('ObjectAttribute.vue', () => {
   test('Does not mutate original component wrapper', () => {
     helpers.mockSettings({ stringifyObjects: true });

diff --git a/tests/Parent.test.js b/tests/Parent.test.js
@@ -1,8 +1,10 @@
 const helpers = require('./helpers.js');
 
-import { mount, shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import Parent from './components/Parent.vue';
 
+const shallowMount = mount;
+
 describe('Parent.vue', () => {
   beforeEach(() => {
     helpers.mockSettings({});

diff --git a/tests/Recursive.test.js b/tests/Recursive.test.js
@@ -1,6 +1,6 @@
 const helpers = require('./helpers.js');
 
-import { mount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import Recursive from './components/Recursive.vue';
 
 /*

diff --git a/tests/ScopedStylesInDependency.test.js b/tests/ScopedStylesInDependency.test.js
@@ -1,6 +1,6 @@
 const helpers = require('./helpers.js');
 
-import { mount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import ScopedStylesInDependency from './components/ScopedStylesInDependency.vue';
 
 describe('ScopedStylesInDependency.vue', () => {

diff --git a/tests/SvgDemo.test.js b/tests/SvgDemo.test.js
@@ -1,6 +1,6 @@
 const helpers = require('./helpers.js');
 
-import { mount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import SvgDemo from './components/SvgDemo.vue';
 
 describe('SvgDemo.vue', () => {

diff --git a/tests/TestTokens.test.js b/tests/TestTokens.test.js
@@ -1,8 +1,10 @@
 const helpers = require('./helpers.js');
 
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import TestTokens from './components/TestTokens.vue';
 
+const shallowMount = mount;
+
 describe('TestTokens.vue', () => {
   test('Remove data-server-rendered, data-test, data-testid, data-test-id by default', () => {
     helpers.mockSettings({});

diff --git a/tests/Zoom.test.js b/tests/Zoom.test.js
@@ -1,6 +1,6 @@
 const helpers = require('./helpers.js');
 
-import { mount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
 import Zoom from './components/Zoom.vue';
 
 describe('Zoom.vue', () => {

diff --git a/tests/src/vnodeManipulation.test.js b/tests/src/vnodeManipulation.test.js
@@ -4,7 +4,9 @@ const helpers = require('../helpers.js');
 const loadOptions = require('../../src/loadOptions.js');
 const vnodeManipulation = require('../../src/vnodeManipulation.js');
 
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@lmiller1990/vue-test-utils-next';
+
+const shallowMount = mount;
 
 describe('VnodeManipulation', () => {
   test('Deep clone fails', () => {