From 4ebffb2bf7a0edf28f7534d2f7485a1f8cf4b2b2 Mon Sep 17 00:00:00 2001 From: Nick Gravelyn Date: Mon, 12 Feb 2018 13:38:05 -0800 Subject: [PATCH] Fix: add-attrs and add-listeners correctly restore silent config option --- src/lib/add-attrs.js | 4 ++-- src/lib/add-listeners.js | 4 ++-- test/specs/add-attrs.spec.js | 10 ++++++++++ test/specs/add-listeners.spec.js | 10 ++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 test/specs/add-attrs.spec.js create mode 100644 test/specs/add-listeners.spec.js diff --git a/src/lib/add-attrs.js b/src/lib/add-attrs.js index d7a6b87ec..6ec46517e 100644 --- a/src/lib/add-attrs.js +++ b/src/lib/add-attrs.js @@ -1,12 +1,12 @@ import Vue from 'vue' export default function addAttrs (vm, attrs) { - const originalVueConfig = Vue.config + const originalSilent = Vue.config.silent Vue.config.silent = true if (attrs) { vm.$attrs = attrs } else { vm.$attrs = {} } - Vue.config.silent = originalVueConfig.silent + Vue.config.silent = originalSilent } diff --git a/src/lib/add-listeners.js b/src/lib/add-listeners.js index b6989f610..0180cb712 100644 --- a/src/lib/add-listeners.js +++ b/src/lib/add-listeners.js @@ -1,12 +1,12 @@ import Vue from 'vue' export default function addListeners (vm, listeners) { - const originalVueConfig = Vue.config + const originalSilent = Vue.config.silent Vue.config.silent = true if (listeners) { vm.$listeners = listeners } else { vm.$listeners = {} } - Vue.config.silent = originalVueConfig.silent + Vue.config.silent = originalSilent } diff --git a/test/specs/add-attrs.spec.js b/test/specs/add-attrs.spec.js new file mode 100644 index 000000000..7e4d5f7b4 --- /dev/null +++ b/test/specs/add-attrs.spec.js @@ -0,0 +1,10 @@ +import Vue from 'vue' +import addAttrs from '~src/lib/add-attrs' + +describe('add-attrs', () => { + it('restores silent config value to original value', () => { + Vue.config.silent = false + addAttrs({}, {}) + expect(Vue.config.silent).to.be.false + }) +}) diff --git a/test/specs/add-listeners.spec.js b/test/specs/add-listeners.spec.js new file mode 100644 index 000000000..354c0e4df --- /dev/null +++ b/test/specs/add-listeners.spec.js @@ -0,0 +1,10 @@ +import Vue from 'vue' +import addListeners from '~src/lib/add-listeners' + +describe('add-listeners', () => { + it('restores silent config value to original value', () => { + Vue.config.silent = false + addListeners({}, {}) + expect(Vue.config.silent).to.be.false + }) +})