fix: only order deps if watcher exists (#583)

* fix: only order deps if watcher exists

* test: skip if scoped slots not supported

* refactor: change test utils checks to consts

* Update utils.js

Author: eddyerburgh

packages/server-test-utils/scripts/build.js

@@ -57,5 +57,6 @@ rollupOptions.forEach(options => {
     .then(() => success(`${options.format} build successful`))
     .catch((err) => {
       error(err)
+      process.exit(1)
     })
 })

packages/test-utils/scripts/build.js

@@ -70,5 +70,6 @@ rollupOptions.forEach(options => {
     .then(() => success(`${options.format} build successful`))
     .catch((err) => {
       error(err)
+      process.exit(1)
     })
 })

packages/test-utils/src/order-watchers.js

@@ -22,7 +22,7 @@ function orderVmWatchers (vm) {
     })
   }
 
-  orderDeps(vm._watcher)
+  vm._watcher && orderDeps(vm._watcher)
 
   vm.$children.forEach(orderVmWatchers)
 }

test/resources/utils.js

@@ -16,21 +16,15 @@ export const isRunningPhantomJS =
   navigator.userAgent.includes &&
   navigator.userAgent.match(/PhantomJS/i)
 
-export function injectSupported () {
-  return vueVersion > 2.2
-}
+export const injectSupported = vueVersion > 2.2
 
-export function attrsSupported () {
-  return vueVersion > 2.2
-}
+export const attrsSupported = vueVersion > 2.2
 
-export function listenersSupported () {
-  return vueVersion > 2.3
-}
+export const listenersSupported = vueVersion > 2.3
 
-export function functionalSFCsSupported () {
-  return vueVersion >= 2.5
-}
+export const functionalSFCsSupported = vueVersion > 2.4
+
+export const scopedSlotsSupported = vueVersion > 2
 
 const shallowAndMount = process.env.TEST_ENV === 'node'
   ? []

test/specs/mount.spec.js

@@ -145,7 +145,7 @@ describeIf(process.env.TEST_ENV !== 'node',
           'prop': 'val'
         }
       })
-      if (injectSupported()) {
+      if (injectSupported) {
       // provide is added by Vue, it's a function in Vue > 2.3
         if (vueVersion > 2.3) {
           expect(typeof wrapper.vm.$options.provide).to.equal('function')

test/specs/mounting-options/attrs.spec.js

@@ -10,7 +10,7 @@ describeWithMountingMethods('options.attrs', (mountingMethod) => {
   itSkipIf(
     mountingMethod.name === 'renderToString' || isRunningPhantomJS,
     'handles inherit attrs', () => {
-      if (!attrsSupported()) return
+      if (!attrsSupported) return
       const wrapper = mountingMethod(compileToFunctions('<p :id="anAttr" />'), {
         attrs: {
           anAttr: 'an attribute'

test/specs/mounting-options/listeners.spec.js

@@ -9,7 +9,7 @@ import {
 describeWithShallowAndMount('options.listeners', (mountingMethod) => {
   itSkipIf(isRunningPhantomJS,
     'handles inherit listeners', () => {
-      if (!listenersSupported()) return
+      if (!listenersSupported) return
       const aListener = () => {}
       const wrapper = mountingMethod(compileToFunctions('<p :id="aListener" />'), {
         listeners: {

test/specs/mounting-options/provide.spec.js

@@ -19,9 +19,9 @@ describeWithMountingMethods('options.provide', (mountingMethod) => {
     config.provide = configProvideSave
   })
 
-  itDoNotRunIf(!injectSupported(),
+  itDoNotRunIf(!injectSupported,
     'provides objects which is injected by mounted component', () => {
-      if (!injectSupported()) return
+      if (!injectSupported) return
 
       const wrapper = mountingMethod(ComponentWithInject, {
         provide: { fromMount: 'objectValue' }
@@ -32,7 +32,7 @@ describeWithMountingMethods('options.provide', (mountingMethod) => {
       expect(HTML).to.contain('objectValue')
     })
 
-  itDoNotRunIf(!injectSupported(),
+  itDoNotRunIf(!injectSupported,
     'provides function which is injected by mounted component', () => {
       const wrapper = mountingMethod(ComponentWithInject, {
         provide () {
@@ -47,9 +47,9 @@ describeWithMountingMethods('options.provide', (mountingMethod) => {
       expect(HTML).to.contain('functionValue')
     })
 
-  itDoNotRunIf(!injectSupported() || mountingMethod.name === 'renderToString',
+  itDoNotRunIf(!injectSupported || mountingMethod.name === 'renderToString',
     'supports beforeCreate in component', () => {
-      if (!injectSupported()) return
+      if (!injectSupported) return
 
       const wrapper = mountingMethod(ComponentWithInject, {
         provide: { fromMount: '_' }
@@ -60,7 +60,7 @@ describeWithMountingMethods('options.provide', (mountingMethod) => {
 
   itSkipIf(mountingMethod.name === 'renderToString',
     'injects the provide from the config', () => {
-      if (!injectSupported()) {
+      if (!injectSupported) {
         return
       }
       config.provide['fromMount'] = 'globalConfig'
@@ -73,7 +73,7 @@ describeWithMountingMethods('options.provide', (mountingMethod) => {
       expect(HTML).to.contain('globalConfig')
     })
 
-  itDoNotRunIf(!injectSupported(), 'prioritize mounting options over config', () => {
+  itDoNotRunIf(!injectSupported, 'prioritize mounting options over config', () => {
     config.provide['fromMount'] = 'globalConfig'
 
     const wrapper = mountingMethod(ComponentWithInject, {

test/specs/wrapper/contains.spec.js

@@ -24,7 +24,7 @@ describeWithShallowAndMount('contains', (mountingMethod) => {
   })
 
   it('returns true if wrapper contains functional Vue component', () => {
-    if (!functionalSFCsSupported()) {
+    if (!functionalSFCsSupported) {
       return false
     }
     const TestComponent = {

test/specs/wrapper/find.spec.js

@@ -132,7 +132,7 @@ describeWithShallowAndMount('find', (mountingMethod) => {
     })
 
   it('returns Wrapper of Vue Component matching functional component', () => {
-    if (!functionalSFCsSupported()) {
+    if (!functionalSFCsSupported) {
       return
     }
     const TestComponent = {