Fix unittests

owncloud · Jul 31, 2023 · 4ee4a41 · 4ee4a41
1 parent b078644
commit 4ee4a41
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 20 deletions.
diff --git a/packages/web-pkg/src/composables/sse/useServerSentEvents.ts b/packages/web-pkg/src/composables/sse/useServerSentEvents.ts
@@ -31,25 +31,29 @@ export const useServerSentEvents = (options: ServerSentEventsOptions) => {
     }
     const setupSSE = async () => {
       retryCounter.value++
-      await fetchEventSource(new URL(options.url, configurationManager.serverUrl).href, {
-        signal: ctrl.signal,
-        headers: {
-          Authorization: `Bearer ${accessToken.value}`,
-          'Accept-Language': unref(language).current,
-          'X-Request-ID': uuidV4()
-        },
-        async onopen(response) {
-          if (response.status === 401) {
-            ctrl.abort()
-            return
+      try {
+        await fetchEventSource(new URL(options.url, configurationManager.serverUrl).href, {
+          signal: ctrl.signal,
+          headers: {
+            Authorization: `Bearer ${accessToken.value}`,
+            'Accept-Language': unref(language).current,
+            'X-Request-ID': uuidV4()
+          },
+          async onopen(response) {
+            if (response.status === 401) {
+              ctrl.abort()
+              return
+            }
+            retryCounter.value = 0
+            await options.onOpen?.(response)
+          },
+          onmessage(msg) {
+            options.onMessage?.(msg)
           }
-          retryCounter.value = 0
-          await options.onOpen?.(response)
-        },
-        onmessage(msg) {
-          options.onMessage?.(msg)
-        }
-      })
+        })
+      } catch (e) {
+        console.error(e)
+      }
     }
     setupSSE().then(() => {
       setupServerSentEvents()

diff --git a/packages/web-runtime/src/components/Topbar/Notifications.vue b/packages/web-runtime/src/components/Topbar/Notifications.vue
@@ -310,7 +310,9 @@ export default {
     }
 
     onMounted(async () => {
-      await setupServerSentEvents()
+      if (setupServerSentEvents) {
+        await setupServerSentEvents()
+      }
       fetchNotificationsTask.perform()
     })
 

diff --git a/packages/web-runtime/tests/unit/components/Topbar/Notifications.spec.ts b/packages/web-runtime/tests/unit/components/Topbar/Notifications.spec.ts
@@ -24,6 +24,8 @@ const selectors = {
   notificationActions: '.oc-notifications-actions'
 }
 
+jest.mock('web-pkg/src/composables/sse/useServerSentEvents')
+
 describe('Notification component', () => {
   it('renders the notification bell and no notifications if there are none', () => {
     const { wrapper } = getWrapper()
@@ -55,7 +57,7 @@ describe('Notification component', () => {
     await wrapper.vm.fetchNotificationsTask.last
     await wrapper.find(selectors.markAll).trigger('click')
     expect(wrapper.find(selectors.notificationItem).exists()).toBeFalsy()
-    expect(mocks.$clientService.owncloudSdk.requests.ocs).toHaveBeenCalledTimes(2)
+    expect(mocks.$clientService.owncloudSdk.requests.ocs).toHaveBeenCalledTimes(3)
   })
   describe('avatar', () => {
     it('loads based on the username', async () => {