Chore: miscellaneous frontend testing

src-ui/src/app/services/open-documents.service.spec.ts

@@ -108,6 +108,7 @@ describe('OpenDocumentsService', () => {
   })
 
   it('should close documents', () => {
+    openDocumentsService.closeDocument({ id: 999 } as any)
     subscriptions.push(
       openDocumentsService.openDocument(documents[0]).subscribe()
     )
@@ -128,15 +129,21 @@ describe('OpenDocumentsService', () => {
     subscriptions.push(
       openDocumentsService.openDocument(documents[0]).subscribe()
     )
+    openDocumentsService.setDirty({ id: 999 }, true) // coverage
     openDocumentsService.setDirty(documents[0], false)
     expect(openDocumentsService.hasDirty()).toBeFalsy()
     openDocumentsService.setDirty(documents[0], true)
     expect(openDocumentsService.hasDirty()).toBeTruthy()
+    let openModal
+    modalService.activeInstances.subscribe((instances) => {
+      openModal = instances[0]
+    })
     const modalSpy = jest.spyOn(modalService, 'open')
     subscriptions.push(
       openDocumentsService.closeDocument(documents[0]).subscribe()
     )
     expect(modalSpy).toHaveBeenCalled()
+    openModal.componentInstance.confirmClicked.next()
   })
 
   it('should allow set dirty status, warn on closeAll', () => {
@@ -148,9 +155,14 @@ describe('OpenDocumentsService', () => {
     )
     openDocumentsService.setDirty(documents[0], true)
     expect(openDocumentsService.hasDirty()).toBeTruthy()
+    let openModal
+    modalService.activeInstances.subscribe((instances) => {
+      openModal = instances[0]
+    })
     const modalSpy = jest.spyOn(modalService, 'open')
     subscriptions.push(openDocumentsService.closeAll().subscribe())
     expect(modalSpy).toHaveBeenCalled()
+    openModal.componentInstance.confirmClicked.next()
   })
 
   it('should load open documents from localStorage', () => {

src-ui/src/app/services/rest/mail-account.service.spec.ts

@@ -58,12 +58,25 @@ describe(`Additional service tests for MailAccountService`, () => {
   it('should support patchMany', () => {
     subscription = service.patchMany(mail_accounts).subscribe()
     mail_accounts.forEach((mail_account) => {
-      const reqs = httpTestingController.match(
+      const req = httpTestingController.expectOne(
         `${environment.apiBaseUrl}${endpoint}/${mail_account.id}/`
       )
-      expect(reqs).toHaveLength(1)
-      expect(reqs[0].request.method).toEqual('PATCH')
+      expect(req.request.method).toEqual('PATCH')
+      req.flush(mail_account)
     })
+    httpTestingController.expectOne(
+      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
+    )
+  })
+
+  it('should support reload', () => {
+    service['reload']()
+    const req = httpTestingController.expectOne(
+      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
+    )
+    expect(req.request.method).toEqual('GET')
+    req.flush({ results: mail_accounts })
+    expect(service.allAccounts).toEqual(mail_accounts)
   })
 
   beforeEach(() => {

src-ui/src/app/services/rest/mail-rule.service.spec.ts

@@ -76,12 +76,26 @@ describe(`Additional service tests for MailRuleService`, () => {
   it('should support patchMany', () => {
     subscription = service.patchMany(mail_rules).subscribe()
     mail_rules.forEach((mail_rule) => {
-      const reqs = httpTestingController.match(
+      const req = httpTestingController.expectOne(
         `${environment.apiBaseUrl}${endpoint}/${mail_rule.id}/`
       )
-      expect(reqs).toHaveLength(1)
-      expect(reqs[0].request.method).toEqual('PATCH')
+      expect(req.request.method).toEqual('PATCH')
+      req.flush(mail_rule)
     })
+    const reloadReq = httpTestingController.expectOne(
+      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
+    )
+    reloadReq.flush({ results: mail_rules })
+  })
+
+  it('should support reload', () => {
+    service['reload']()
+    const req = httpTestingController.expectOne(
+      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
+    )
+    expect(req.request.method).toEqual('GET')
+    req.flush({ results: mail_rules })
+    expect(service.allRules).toEqual(mail_rules)
   })
 
   beforeEach(() => {