fix vue warnings and cover non setup initializations

Maronato · Oct 17, 2021 · 074ceb8 · 074ceb8
1 parent 8b15bd4
commit 074ceb8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -44,14 +44,18 @@ const VueToastificationPlugin: Plugin = (App, options?: PluginOptions) => {
 
 const provideToast = (options?: PluginOptions) => {
   const toast = ownExports.createToastInterface(options)
-  provide(toastInjectionKey, toast)
+  if (getCurrentInstance()) {
+    provide(toastInjectionKey, toast)
+  }
 }
 
 const useToast = (eventBus?: EventBus) => {
   if (eventBus) {
     return ownExports.createToastInterface(eventBus)
   }
-  const toast = getCurrentInstance() ? inject(toastInjectionKey) : undefined
+  const toast = getCurrentInstance()
+    ? inject(toastInjectionKey, undefined)
+    : undefined
   return toast ? toast : ownExports.createToastInterface(globalEventBus)
 }
 

diff --git a/tests/unit/index.spec.ts b/tests/unit/index.spec.ts
@@ -15,12 +15,15 @@ const Consumer = {
   },
 }
 
-const Provider = defineComponent({
-  setup() {
-    index.provideToast()
-    return () => vue.h(Consumer)
-  },
-})
+const createProvider = (options?: index.PluginOptions) =>
+  defineComponent({
+    setup() {
+      index.provideToast(options)
+      return () => vue.h(Consumer)
+    },
+  })
+
+const Provider = createProvider()
 
 const Middle = {
   render: () => vue.h(Consumer),
@@ -123,7 +126,7 @@ describe("createToastInterface", () => {
   })
   it("uses mock if not in browser", () => {
     const isBrowserSpy = jest.spyOn(utils, "isBrowser")
-    const consoleSpy = jest.spyOn(console, "warn")
+    const consoleSpy = jest.spyOn(console, "warn").mockImplementation()
     isBrowserSpy.mockReturnValueOnce(false)
 
     const toast = index.createToastInterface()
@@ -149,7 +152,7 @@ describe("provideToast", () => {
     expect(provideSpy).not.toHaveBeenCalled()
     expect(createToastInterfaceSpy).not.toHaveBeenCalled()
 
-    index.provideToast()
+    mount(Provider)
 
     expect(provideSpy).toHaveBeenCalledTimes(1)
     expect(provideSpy).toHaveBeenCalledWith(
@@ -167,7 +170,7 @@ describe("provideToast", () => {
     expect(provideSpy).not.toHaveBeenCalled()
     expect(createToastInterfaceSpy).not.toHaveBeenCalled()
 
-    index.provideToast({ maxToasts: 10, timeout: 100 })
+    mount(createProvider({ maxToasts: 10, timeout: 100 }))
 
     expect(provideSpy).toHaveBeenCalledTimes(1)
     expect(provideSpy).toHaveBeenCalledWith(
@@ -182,6 +185,20 @@ describe("provideToast", () => {
       })
     )
   })
+
+  it("does not provide if not in setup", () => {
+    const provideSpy = jest.spyOn(vue, "provide")
+    const createToastInterfaceSpy = jest.spyOn(index, "createToastInterface")
+
+    expect(provideSpy).not.toHaveBeenCalled()
+    expect(createToastInterfaceSpy).not.toHaveBeenCalled()
+
+    index.provideToast()
+
+    expect(provideSpy).toHaveBeenCalledTimes(0)
+    expect(createToastInterfaceSpy).toHaveBeenCalledTimes(1)
+    expect(createToastInterfaceSpy).toHaveBeenCalledWith(undefined)
+  })
 })
 
 describe("useToast", () => {