mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2024-11-21 17:26:29 -05:00
fix: improve deep partial type used in tests
The deep partial type from redux had the problem that it could only be applied to records. This caused problems with primitive types and arrays. Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
This commit is contained in:
parent
b5b61aec6a
commit
8a745f3f32
4 changed files with 19 additions and 8 deletions
13
commons/src/utils/deep-partial.ts
Normal file
13
commons/src/utils/deep-partial.ts
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
export type DeepPartial<T> = T extends null | undefined
|
||||||
|
? T
|
||||||
|
: T extends Array<infer ArrayType>
|
||||||
|
? Array<DeepPartial<ArrayType>>
|
||||||
|
: T extends Record<string | number | symbol, unknown>
|
||||||
|
? { [P in keyof T]?: DeepPartial<T[P]> }
|
||||||
|
: T
|
|
@ -5,3 +5,4 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export * from './wait-for-other-promises-to-finish.js'
|
export * from './wait-for-other-promises-to-finish.js'
|
||||||
|
export type { DeepPartial } from './deep-partial.js'
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
*/
|
*/
|
||||||
import * as useApplicationStateModule from '../hooks/common/use-application-state'
|
import * as useApplicationStateModule from '../hooks/common/use-application-state'
|
||||||
import type { ApplicationState } from '../redux/application-state'
|
import type { ApplicationState } from '../redux/application-state'
|
||||||
import type { DeepPartial } from 'redux'
|
|
||||||
import { initialState as initialStateDarkMode } from '../redux/dark-mode/reducers'
|
import { initialState as initialStateDarkMode } from '../redux/dark-mode/reducers'
|
||||||
import { initialState as initialStateEditorConfig } from '../redux/editor/reducers'
|
import { initialState as initialStateEditorConfig } from '../redux/editor/reducers'
|
||||||
import { initialState as initialStateNoteDetails } from '../redux/note-details/initial-state'
|
import { initialState as initialStateNoteDetails } from '../redux/note-details/initial-state'
|
||||||
|
@ -13,7 +12,7 @@ import { initialState as initialStateRealtimeStatus } from '../redux/realtime/re
|
||||||
import { initialState as initialStateRendererStatus } from '../redux/renderer-status/reducers'
|
import { initialState as initialStateRendererStatus } from '../redux/renderer-status/reducers'
|
||||||
import type { NoteDetails } from '../redux/note-details/types/note-details'
|
import type { NoteDetails } from '../redux/note-details/types/note-details'
|
||||||
import type { RealtimeStatus } from '../redux/realtime/types'
|
import type { RealtimeStatus } from '../redux/realtime/types'
|
||||||
import type { HistoryEntryWithOrigin } from '../api/history/types'
|
import type { DeepPartial } from '@hedgedoc/commons'
|
||||||
|
|
||||||
jest.mock('../redux/editor/methods', () => ({
|
jest.mock('../redux/editor/methods', () => ({
|
||||||
loadFromLocalStorage: jest.fn().mockReturnValue(undefined)
|
loadFromLocalStorage: jest.fn().mockReturnValue(undefined)
|
||||||
|
@ -37,7 +36,7 @@ export const mockAppState = (state?: DeepPartial<ApplicationState>) => {
|
||||||
...initialStateEditorConfig,
|
...initialStateEditorConfig,
|
||||||
...state?.editorConfig
|
...state?.editorConfig
|
||||||
},
|
},
|
||||||
history: (state?.history ?? []) as HistoryEntryWithOrigin[],
|
history: state?.history ?? [],
|
||||||
noteDetails: {
|
noteDetails: {
|
||||||
...initialStateNoteDetails,
|
...initialStateNoteDetails,
|
||||||
...state?.noteDetails
|
...state?.noteDetails
|
||||||
|
|
|
@ -4,10 +4,8 @@
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
*/
|
*/
|
||||||
import type { ApplicationState } from '../redux/application-state'
|
import type { ApplicationState } from '../redux/application-state'
|
||||||
import type { DeepPartial } from 'redux'
|
|
||||||
import { mockAppState } from './mock-app-state'
|
import { mockAppState } from './mock-app-state'
|
||||||
import type { LoginUserInfo } from '../api/me/types'
|
import type { DeepPartial, NotePermissions } from '@hedgedoc/commons'
|
||||||
import type { NotePermissions } from '@hedgedoc/commons'
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mocks the {@link NotePermissions} field of a note in the {@link ApplicationState }for a test.
|
* Mocks the {@link NotePermissions} field of a note in the {@link ApplicationState }for a test.
|
||||||
|
@ -38,6 +36,6 @@ export const mockNotePermissions = (
|
||||||
user: {
|
user: {
|
||||||
...additionalState?.user,
|
...additionalState?.user,
|
||||||
username: ownUsername
|
username: ownUsername
|
||||||
} as LoginUserInfo
|
}
|
||||||
})
|
} as DeepPartial<ApplicationState>)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue