refactor: validPlugin and unit test

vue-final · Apr 3, 2021 · 8e2b590 · 8e2b590
1 parent c041371
commit 8e2b590
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/dist/VueFinalModal.esm.js b/dist/VueFinalModal.esm.js
diff --git a/dist/VueFinalModal.esm.js.map b/dist/VueFinalModal.esm.js.map
diff --git a/dist/VueFinalModal.umd.js b/dist/VueFinalModal.umd.js
diff --git a/dist/VueFinalModal.umd.js.map b/dist/VueFinalModal.umd.js.map
diff --git a/lib/Plugin.js b/lib/Plugin.js
@@ -8,7 +8,7 @@ const defaultOptions = {
 }
 
 const validPlugin = (duplicateKey, duplicateComponent, duplicateDynamicContainer) => {
-  if (!(duplicateComponent || duplicateDynamicContainer)) return true
+  if (!(duplicateKey || duplicateComponent || duplicateDynamicContainer)) return true
 
   if (typeof window === 'undefined') return false
 
@@ -26,11 +26,8 @@ const Plugin = pluginOptions => ({
     const duplicateComponent = Vue.options.components[_options.componentName]
     const duplicateDynamicContainer = Vue.options.components[_options.dynamicContainerName]
 
-    const isValid = validPlugin(duplicateKey, duplicateComponent, duplicateDynamicContainer)
-    if (isValid) {
-      if (!duplicateKey) {
-        bindPrototype(Vue, _options)
-      }
+    if (validPlugin(duplicateKey, duplicateComponent, duplicateDynamicContainer)) {
+      bindPrototype(Vue, _options)
       registModal(Vue, _options)
       registContainer(Vue, _options)
     }

diff --git a/tests/unit/Plugin.spec.js b/tests/unit/Plugin.spec.js
@@ -29,7 +29,7 @@ describe('Plugin', () => {
         dynamicContainerName: 'TestContainer'
       })
     )
-    expect(spy).toHaveBeenCalledTimes(0)
+    expect(spy).toHaveBeenCalledTimes(1)
   })
   it('duplicate component', () => {
     const spy = createSpyError()