mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-07-12 17:04:40 -05:00
Merge branch 'dev' into feature-10188-savedview-count
This commit is contained in:
commit
af7cd8fadf
File diff suppressed because it is too large
Load Diff
@ -1216,6 +1216,7 @@ export class FilterEditorComponent
|
|||||||
|
|
||||||
resetSelected() {
|
resetSelected() {
|
||||||
this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
|
this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
|
||||||
|
this.documentService.searchQuery = ''
|
||||||
this.filterRules = this._unmodifiedFilterRules
|
this.filterRules = this._unmodifiedFilterRules
|
||||||
this.updateRules()
|
this.updateRules()
|
||||||
}
|
}
|
||||||
|
@ -158,13 +158,14 @@ describe('MailComponent', () => {
|
|||||||
|
|
||||||
it('should show errors on load if load mailAccounts failure', () => {
|
it('should show errors on load if load mailAccounts failure', () => {
|
||||||
const toastErrorSpy = jest.spyOn(toastService, 'showError')
|
const toastErrorSpy = jest.spyOn(toastService, 'showError')
|
||||||
|
jest.spyOn(mailAccountService, 'getCached').mockReturnValue(of(null))
|
||||||
jest
|
jest
|
||||||
.spyOn(mailAccountService, 'listAll')
|
.spyOn(mailAccountService, 'listAll')
|
||||||
.mockImplementation(() =>
|
.mockImplementation(() =>
|
||||||
throwError(() => new Error('failed to load mail accounts'))
|
throwError(() => new Error('failed to load mail accounts'))
|
||||||
)
|
)
|
||||||
completeSetup(mailAccountService)
|
completeSetup(mailAccountService)
|
||||||
expect(toastErrorSpy).toBeCalled()
|
expect(toastErrorSpy).toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should show errors on load if load mailRules failure', () => {
|
it('should show errors on load if load mailRules failure', () => {
|
||||||
@ -175,7 +176,7 @@ describe('MailComponent', () => {
|
|||||||
throwError(() => new Error('failed to load mail rules'))
|
throwError(() => new Error('failed to load mail rules'))
|
||||||
)
|
)
|
||||||
completeSetup(mailRuleService)
|
completeSetup(mailRuleService)
|
||||||
expect(toastErrorSpy).toBeCalled()
|
expect(toastErrorSpy).toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should support edit / create mail account, show error if needed', () => {
|
it('should support edit / create mail account, show error if needed', () => {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user