refactor: remove unnecessary alias

dobromir-hristov · dobromir-hristov · commit 135b24263f6c · 2020-01-07T23:54:52.000+02:00
diff --git a/test/resources/utils.js b/test/resources/utils.js
@@ -1,8 +1,8 @@
 /* global describe */
 
 import Vue from 'vue'
-import { shallowMount, mount } from '~vue/test-utils'
-import { renderToString } from '~vue/server-test-utils'
+import { shallowMount, mount } from '@vue/test-utils'
+import { renderToString } from '@vue/server-test-utils'
 
 export const vueVersion = Number(
   `${Vue.version.split('.')[0]}.${Vue.version.split('.')[1]}`
diff --git a/test/setup/webpack.test.config.js b/test/setup/webpack.test.config.js
@@ -20,21 +20,15 @@ const rules = [].concat(
 )
 const externals = nodeExternals({
   // we need to whitelist both `create-instance` and files in `shared` package. Otherwise Webpack wont bundle them in the test dev env
-  whitelist: ['create-instance', /^shared\/.*/]
+  whitelist: ['@vue/test-utils', '@vue/server-test-utils', 'create-instance', /^shared\/.*/]
 })
 // define the default aliases
-let aliasedFiles = {
-  '~vue/server-test-utils': `@vue/server-test-utils`,
-  '~vue/test-utils': `@vue/test-utils`
-}
+let aliasedFiles = {}
 if (process.env.TARGET === 'dev') {
-  // if we are in dev test mode, we want to alias all files to the src file, not dist
+// if we are in dev test mode, we want to alias all files to the src file, not dist
   aliasedFiles = {
-    // we need both as some places import the old alias with ~, others directly test utils package.
     '@vue/server-test-utils': `@vue/server-test-utils/src/index.js`,
-    '@vue/test-utils': `@vue/test-utils/src/index.js`,
-    '~vue/server-test-utils': `@vue/server-test-utils/src/index.js`,
-    '~vue/test-utils': `@vue/test-utils/src/index.js`
+    '@vue/test-utils': `@vue/test-utils/src/index.js`
   }
 }
 module.exports = {
diff --git a/test/specs/components/RouterLink.spec.js b/test/specs/components/RouterLink.spec.js
@@ -1,4 +1,4 @@
-import { RouterLinkStub } from '~vue/test-utils'
+import { RouterLinkStub } from '@vue/test-utils'
 import { describeWithShallowAndMount } from '~resources/utils'
 
 describeWithShallowAndMount('RouterLinkStub', mountingMethod => {
diff --git a/test/specs/config.spec.js b/test/specs/config.spec.js
@@ -1,6 +1,6 @@
 import { describeWithShallowAndMount } from '~resources/utils'
 import ComponentWithProps from '~resources/components/component-with-props.vue'
-import { config, createLocalVue } from '~vue/test-utils'
+import { config, createLocalVue } from '@vue/test-utils'
 
 describeWithShallowAndMount('config', mountingMethod => {
   const sandbox = sinon.createSandbox()
diff --git a/test/specs/create-local-vue.spec.js b/test/specs/create-local-vue.spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import VueRouter from 'vue-router'
-import { createLocalVue } from '~vue/test-utils'
+import { createLocalVue } from '@vue/test-utils'
 import Component from '~resources/components/component.vue'
 import ComponentWithVuex from '~resources/components/component-with-vuex.vue'
 import ComponentWithRouter from '~resources/components/component-with-router.vue'
diff --git a/test/specs/create-wrapper.spec.js b/test/specs/create-wrapper.spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { createWrapper, Wrapper, WrapperArray } from '~vue/test-utils'
+import { createWrapper, Wrapper, WrapperArray } from '@vue/test-utils'
 import Component from '~resources/components/component.vue'
 import { describeRunIf } from 'conditional-specs'
 
diff --git a/test/specs/external-libraries.spec.js b/test/specs/external-libraries.spec.js
@@ -1,4 +1,4 @@
-import { createLocalVue, mount } from '~vue/test-utils'
+import { createLocalVue, mount } from '@vue/test-utils'
 import VeeValidate from 'vee-validate'
 import { describeWithShallowAndMount } from '~resources/utils'
 
diff --git a/test/specs/mount.spec.js b/test/specs/mount.spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { compileToFunctions } from 'vue-template-compiler'
-import { mount, createLocalVue } from '~vue/test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import Component from '~resources/components/component.vue'
 import ComponentWithProps from '~resources/components/component-with-props.vue'
 import ComponentWithMixin from '~resources/components/component-with-mixin.vue'
diff --git a/test/specs/mounting-options/localVue.spec.js b/test/specs/mounting-options/localVue.spec.js
@@ -4,7 +4,7 @@ import {
   isRunningPhantomJS,
   vueVersion
 } from '~resources/utils'
-import { createLocalVue, shallowMount, mount } from '~vue/test-utils'
+import { createLocalVue, shallowMount, mount } from '@vue/test-utils'
 import { itSkipIf, itRunIf, itDoNotRunIf } from 'conditional-specs'
 import Vuex from 'vuex'
 
diff --git a/test/specs/mounting-options/methods.spec.js b/test/specs/mounting-options/methods.spec.js
@@ -1,4 +1,4 @@
-import { config } from '~vue/test-utils'
+import { config } from '@vue/test-utils'
 import { describeWithShallowAndMount } from '~resources/utils'
 
 describeWithShallowAndMount('options.methods', mountingMethod => {
diff --git a/test/specs/mounting-options/mocks.spec.js b/test/specs/mounting-options/mocks.spec.js
@@ -1,4 +1,4 @@
-import { createLocalVue, config } from '~vue/test-utils'
+import { createLocalVue, config } from '@vue/test-utils'
 import Vue from 'vue'
 import Component from '~resources/components/component.vue'
 import ComponentWithVuex from '~resources/components/component-with-vuex.vue'
diff --git a/test/specs/mounting-options/propsData.spec.js b/test/specs/mounting-options/propsData.spec.js
@@ -1,4 +1,4 @@
-import { shallowMount } from '~vue/test-utils'
+import { shallowMount } from '@vue/test-utils'
 import ComponentWithProps from '~resources/components/component-with-props.vue'
 import { describeRunIf } from 'conditional-specs'
 
diff --git a/test/specs/mounting-options/provide.spec.js b/test/specs/mounting-options/provide.spec.js
@@ -1,5 +1,5 @@
-import { config } from '~vue/test-utils'
-import { createLocalVue } from '~vue/test-utils'
+import { config } from '@vue/test-utils'
+import { createLocalVue } from '@vue/test-utils'
 import ComponentWithInject from '~resources/components/component-with-inject.vue'
 import CompositionComponentWithInject from '~resources/components/component-with-inject-composition.vue'
 import { injectSupported } from '~resources/utils'
diff --git a/test/specs/mounting-options/scopedSlots.spec.js b/test/specs/mounting-options/scopedSlots.spec.js
@@ -1,5 +1,5 @@
 import { describeWithShallowAndMount, vueVersion } from '~resources/utils'
-import { createLocalVue } from '~vue/test-utils'
+import { createLocalVue } from '@vue/test-utils'
 import ComponentWithScopedSlots from '~resources/components/component-with-scoped-slots.vue'
 import { itDoNotRunIf } from 'conditional-specs'
 import Vue from 'vue'
diff --git a/test/specs/mounting-options/slots.spec.js b/test/specs/mounting-options/slots.spec.js
@@ -5,7 +5,7 @@ import ComponentAsAClass from '~resources/components/component-as-a-class.vue'
 import ComponentWithParentName from '~resources/components/component-with-parent-name.vue'
 import { describeWithShallowAndMount, vueVersion } from '~resources/utils'
 import { itDoNotRunIf } from 'conditional-specs'
-import { mount, createLocalVue } from '~vue/test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 
 describeWithShallowAndMount('options.slots', mountingMethod => {
   it('mounts component with default slot if passed component in slot object', () => {
@@ -138,8 +138,8 @@ describeWithShallowAndMount('options.slots', mountingMethod => {
     require.cache[
       require.resolve('vue-template-compiler')
     ].exports.compileToFunctions = undefined
-    delete require.cache[require.resolve('../../../packages/test-utils')]
-    const mountingMethodFresh = require('../../../packages/test-utils')[
+    delete require.cache[require.resolve('@vue/test-utils')]
+    const mountingMethodFresh = require('@vue/test-utils')[
       mountingMethod.name
     ]
     const message =
@@ -391,11 +391,10 @@ describeWithShallowAndMount('options.slots', mountingMethod => {
     const compilerSave =
       require.cache[require.resolve('vue-template-compiler')].exports
         .compileToFunctions
-    require.cache[require.resolve('vue-template-compiler')].exports = {
-      compileToFunctions: undefined
-    }
-    delete require.cache[require.resolve('../../../packages/test-utils')]
-    const mountingMethodFresh = require('../../../packages/test-utils')[
+    require.cache[require.resolve('vue-template-compiler')].exports.compileToFunctions = undefined
+
+    delete require.cache[require.resolve('@vue/test-utils')]
+    const mountingMethodFresh = require('@vue/test-utils')[
       mountingMethod.name
     ]
     const message =
diff --git a/test/specs/mounting-options/stubs.spec.js b/test/specs/mounting-options/stubs.spec.js
@@ -2,8 +2,8 @@ import ComponentWithChild from '~resources/components/component-with-child.vue'
 import ComponentWithNestedChildren from '~resources/components/component-with-nested-children.vue'
 import Component from '~resources/components/component.vue'
 import ComponentAsAClass from '~resources/components/component-as-a-class.vue'
-import { createLocalVue, config } from '~vue/test-utils'
-import { config as serverConfig } from '~vue/server-test-utils'
+import { createLocalVue, config } from '@vue/test-utils'
+import { config as serverConfig } from '@vue/server-test-utils'
 import Vue from 'vue'
 import { describeWithShallowAndMount, vueVersion } from '~resources/utils'
 import { itDoNotRunIf, itSkipIf, itRunIf } from 'conditional-specs'
@@ -263,9 +263,9 @@ describeWithShallowAndMount('options.stub', mountingMethod => {
     require.cache[
       require.resolve('vue-template-compiler')
     ].exports.compileToFunctions = undefined
-    delete require.cache[require.resolve('../../../packages/test-utils')]
-    delete require.cache[require.resolve('../../../packages/server-test-utils')]
-    const mountingMethodFresh = require('../../../packages/test-utils')[
+    delete require.cache[require.resolve('@vue/test-utils')]
+    delete require.cache[require.resolve('@vue/server-test-utils')]
+    const mountingMethodFresh = require('@vue/test-utils')[
       mountingMethod.name
     ]
     const message =
diff --git a/test/specs/render.spec.js b/test/specs/render.spec.js
@@ -1,4 +1,4 @@
-import { render } from '~vue/server-test-utils'
+import { render } from '@vue/server-test-utils'
 import Cheerio from 'cheerio'
 import { describeDoNotRunIf } from 'conditional-specs'
 
diff --git a/test/specs/renderToString.spec.js b/test/specs/renderToString.spec.js
@@ -1,5 +1,5 @@
-import { renderToString } from '~vue/server-test-utils'
-import { createLocalVue } from '~vue/test-utils'
+import { renderToString } from '@vue/server-test-utils'
+import { createLocalVue } from '@vue/test-utils'
 import ComponentWithChild from '~resources/components/component-with-child.vue'
 import { describeDoNotRunIf } from 'conditional-specs'
 
diff --git a/test/specs/shallow-mount.spec.js b/test/specs/shallow-mount.spec.js
@@ -1,6 +1,6 @@
 import { compileToFunctions } from 'vue-template-compiler'
 import Vue from 'vue'
-import { mount, shallowMount, createLocalVue } from '~vue/test-utils'
+import { mount, shallowMount, createLocalVue } from '@vue/test-utils'
 import Component from '~resources/components/component.vue'
 import ComponentWithChild from '~resources/components/component-with-child.vue'
 import ComponentWithNestedChildren from '~resources/components/component-with-nested-children.vue'
diff --git a/test/specs/wrapper-array.spec.js b/test/specs/wrapper-array.spec.js
@@ -1,4 +1,4 @@
-import { Wrapper, WrapperArray } from '~vue/test-utils'
+import { Wrapper, WrapperArray } from '@vue/test-utils'
 import { describeWithShallowAndMount } from '~resources/utils'
 
 describeWithShallowAndMount('WrapperArray', mountingMethod => {
diff --git a/test/specs/wrapper-array/at.spec.js b/test/specs/wrapper-array/at.spec.js
@@ -1,5 +1,5 @@
 import { describeWithShallowAndMount } from '~resources/utils'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('at', mountingMethod => {
   it('returns Wrapper at index', () => {
diff --git a/test/specs/wrapper-array/attributes.spec.js b/test/specs/wrapper-array/attributes.spec.js
@@ -1,5 +1,5 @@
 import { describeWithShallowAndMount } from '~resources/utils'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('attributes', mountingMethod => {
   it('throws error if wrapper array contains no items', () => {
diff --git a/test/specs/wrapper-array/classes.spec.js b/test/specs/wrapper-array/classes.spec.js
@@ -1,5 +1,5 @@
 import { describeWithShallowAndMount } from '~resources/utils'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('classes', mountingMethod => {
   it('throws error if wrapper array contains no items', () => {
diff --git a/test/specs/wrapper-array/contains.spec.js b/test/specs/wrapper-array/contains.spec.js
@@ -1,5 +1,5 @@
 import { describeWithShallowAndMount } from '~resources/utils'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('contains', mountingMethod => {
   it('returns true if every Wrapper contains element', () => {
diff --git a/test/specs/wrapper-array/find.spec.js b/test/specs/wrapper-array/find.spec.js
@@ -1,5 +1,5 @@
 import { describeWithShallowAndMount } from '~resources/utils'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('find', mountingMethod => {
   it('throws error if wrapper array contains no items', () => {
diff --git a/test/specs/wrapper-array/findAll.spec.js b/test/specs/wrapper-array/findAll.spec.js
@@ -1,6 +1,6 @@
 import { describeWithShallowAndMount } from '~resources/utils'
 import { compileToFunctions } from 'vue-template-compiler'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('findAll', mountingMethod => {
   it('throws error if wrapper array contains no items', () => {
diff --git a/test/specs/wrapper-array/html.spec.js b/test/specs/wrapper-array/html.spec.js
@@ -1,6 +1,6 @@
 import { describeWithShallowAndMount } from '~resources/utils'
 import { compileToFunctions } from 'vue-template-compiler'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('html', mountingMethod => {
   it('throws error if wrapper array contains no items', () => {
diff --git a/test/specs/wrapper-array/isEmpty.spec.js b/test/specs/wrapper-array/isEmpty.spec.js
@@ -1,6 +1,6 @@
 import { describeWithShallowAndMount } from '~resources/utils'
 import { compileToFunctions } from 'vue-template-compiler'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('isEmpty', mountingMethod => {
   it('returns true if node is empty', () => {
diff --git a/test/specs/wrapper-array/isVisible.spec.js b/test/specs/wrapper-array/isVisible.spec.js
@@ -1,6 +1,6 @@
 import { describeWithShallowAndMount } from '~resources/utils'
 import { compileToFunctions } from 'vue-template-compiler'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('isVisible', mountingMethod => {
   it('returns true if node has no inline style', () => {
diff --git a/test/specs/wrapper-array/name.spec.js b/test/specs/wrapper-array/name.spec.js
@@ -1,6 +1,6 @@
 import { describeWithShallowAndMount } from '~resources/utils'
 import { compileToFunctions } from 'vue-template-compiler'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('name', mountingMethod => {
   it('throws an error when called on a WrapperArray', () => {
diff --git a/test/specs/wrapper-array/props.spec.js b/test/specs/wrapper-array/props.spec.js
@@ -1,6 +1,6 @@
 import { describeWithShallowAndMount } from '~resources/utils'
 import { compileToFunctions } from 'vue-template-compiler'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('props', mountingMethod => {
   it('throws error if wrapper array contains no items', () => {
diff --git a/test/specs/wrapper-array/text.spec.js b/test/specs/wrapper-array/text.spec.js
@@ -1,6 +1,6 @@
 import { describeWithShallowAndMount } from '~resources/utils'
 import { compileToFunctions } from 'vue-template-compiler'
-import '~vue/test-utils'
+import '@vue/test-utils'
 
 describeWithShallowAndMount('text', mountingMethod => {
   it('throws error when called on a WrapperArray', () => {
diff --git a/test/specs/wrapper/emitted.spec.js b/test/specs/wrapper/emitted.spec.js
@@ -1,4 +1,4 @@
-import { createLocalVue, createWrapper } from '~vue/test-utils'
+import { createLocalVue, createWrapper } from '@vue/test-utils'
 import { describeWithShallowAndMount, vueVersion } from '~resources/utils'
 import { itDoNotRunIf } from 'conditional-specs'
 import Vue from 'vue'
diff --git a/test/specs/wrapper/find.spec.js b/test/specs/wrapper/find.spec.js
@@ -1,5 +1,5 @@
 import { compileToFunctions } from 'vue-template-compiler'
-import { createLocalVue } from '~vue/test-utils'
+import { createLocalVue } from '@vue/test-utils'
 import Vue from 'vue'
 import ComponentWithChild from '~resources/components/component-with-child.vue'
 import ComponentWithoutName from '~resources/components/component-without-name.vue'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { RouterLinkStub } from '~vue/test-utils'`
	`1`	`+import { RouterLinkStub } from '@vue/test-utils'`
`2`	`2`	`import { describeWithShallowAndMount } from '~resources/utils'`
`3`	`3`
`4`	`4`	`describeWithShallowAndMount('RouterLinkStub', mountingMethod => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { createLocalVue, mount } from '~vue/test-utils'`
	`1`	`+import { createLocalVue, mount } from '@vue/test-utils'`
`2`	`2`	`import VeeValidate from 'vee-validate'`
`3`	`3`	`import { describeWithShallowAndMount } from '~resources/utils'`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { config } from '~vue/test-utils'`
	`1`	`+import { config } from '@vue/test-utils'`
`2`	`2`	`import { describeWithShallowAndMount } from '~resources/utils'`
`3`	`3`
`4`	`4`	`describeWithShallowAndMount('options.methods', mountingMethod => {`