Skip to content

Commit 37f18fe

Browse files
authored
Merge pull request #7394 from LibreSign/backport/7393/stable32
[stable32] fix: standardize @nextcloud/l10n mocks to global helper
2 parents 06c9ff3 + c93c771 commit 37f18fe

79 files changed

Lines changed: 109 additions & 158 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/tests/App.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
import { beforeEach, describe, expect, it, vi } from 'vitest'
7-
import { createL10nMock } from './testHelpers/l10n.js'
87
import { mount } from '@vue/test-utils'
98

109
import { initialActionCode, ACTION_CODES } from '../helpers/ActionMapping'
@@ -31,7 +30,7 @@ vi.mock('vue-router', async () => {
3130
}
3231
})
3332

34-
vi.mock('@nextcloud/l10n', () => createL10nMock())
33+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n())
3534

3635
vi.mock('@nextcloud/vue/components/NcContent', () => ({
3736
default: { name: 'NcContent', template: '<div class="nc-content"><slot /></div>', props: ['appName'] },

src/tests/ExternalApp.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
import { beforeEach, describe, expect, it, vi } from 'vitest'
7-
import { createL10nMock } from './testHelpers/l10n.js'
87
import { mount } from '@vue/test-utils'
98

109
import { initialActionCode, ACTION_CODES } from '../helpers/ActionMapping'
@@ -13,7 +12,7 @@ vi.mock('@nextcloud/initial-state', () => ({
1312
loadState: vi.fn((app, key, defaultValue) => defaultValue),
1413
}))
1514

16-
vi.mock('@nextcloud/l10n', () => createL10nMock())
15+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n())
1716

1817
import ExternalApp from '../ExternalApp.vue'
1918

src/tests/actions/openInLibreSignAction.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
import { describe, expect, it, beforeEach, vi, afterEach } from 'vitest'
7-
import { createL10nMock } from '../testHelpers/l10n.js'
87

98
// Mock @nextcloud/logger to avoid import-time errors with @nextcloud/vue
109
vi.mock('@nextcloud/logger', () => ({
@@ -83,7 +82,7 @@ vi.mock('@nextcloud/initial-state', () => ({
8382
}),
8483
}))
8584

86-
vi.mock('@nextcloud/l10n', () => createL10nMock())
85+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n())
8786

8887
vi.mock('@nextcloud/vue/functions/dialog', () => ({
8988
spawnDialog: vi.fn(() => Promise.resolve('Test Envelope')),

src/tests/components/CodeEditor.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
*/
55

66
import { beforeEach, describe, expect, it, vi } from 'vitest'
7-
import { createL10nMock } from '../testHelpers/l10n.js'
87
import { mount } from '@vue/test-utils'
98

109
import CodeEditor from '../../components/CodeEditor.vue'
1110

12-
vi.mock('@nextcloud/l10n', () => createL10nMock())
11+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n())
1312

1413
vi.mock('@ssddanbrown/codemirror-lang-twig', () => ({
1514
twig: vi.fn(() => ({ name: 'twig-extension' })),

src/tests/components/File/File.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
import { beforeEach, describe, expect, it, vi } from 'vitest'
7-
import { createL10nMock } from '../../testHelpers/l10n.js'
87
import { mount } from '@vue/test-utils'
98

109
import File from '../../../components/File/File.vue'
@@ -37,7 +36,7 @@ const sidebarStoreMock = {
3736
activeRequestSignatureTab: vi.fn(),
3837
}
3938

40-
vi.mock('@nextcloud/l10n', () => createL10nMock())
39+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n())
4140

4241
vi.mock('@nextcloud/router', () => ({
4342
generateOcsUrl: vi.fn((path: string, params?: Record<string, string | number>) => {

src/tests/components/FileStatusList.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
*/
55

66
import { beforeEach, describe, expect, it, vi } from 'vitest'
7-
import { createL10nMock } from '../testHelpers/l10n.js'
87
import { mount } from '@vue/test-utils'
98

109
import FileStatusList from '../../components/FileStatusList.vue'
1110

1211
const axiosGetMock = vi.fn()
1312

14-
vi.mock('@nextcloud/l10n', () => createL10nMock())
13+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n())
1514

1615
vi.mock('@nextcloud/files', () => ({
1716
formatFileSize: vi.fn((size: number) => `${size}B`),

src/tests/components/LeftSidebar/LeftSidebar.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ vi.mock('@nextcloud/auth', () => ({
1919
getCurrentUser: () => getCurrentUserMock(),
2020
}))
2121

22-
vi.mock('@nextcloud/l10n', async () => {
23-
const { createL10nMock } = await import('../../testHelpers/l10n.js')
24-
return createL10nMock()
25-
})
22+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n())
2623

2724
vi.mock('../../../store/files.js', () => ({
2825
useFilesStore: () => ({

src/tests/components/MarkdownEditor.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
7-
import { createL10nMock } from '../testHelpers/l10n.js'
87
import { mount, flushPromises } from '@vue/test-utils'
98
import type { VueWrapper } from '@vue/test-utils'
109

@@ -30,7 +29,7 @@ type MarkdownEditorWrapper = VueWrapper<any> & {
3029

3130
let MarkdownEditor: any
3231

33-
vi.mock('@nextcloud/l10n', () => createL10nMock())
32+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n())
3433

3534
beforeAll(async () => {
3635
;({ default: MarkdownEditor } = await import('../../components/MarkdownEditor.vue'))

src/tests/components/PdfEditor/SignatureBox.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { describe, expect, it, vi } from 'vitest'
7-
import { createL10nMock, interpolateL10n } from '../../testHelpers/l10n.js'
7+
import { interpolateL10n } from '../../testHelpers/l10n.js'
88
import { mount } from '@vue/test-utils'
99
import type { SignerSummaryRecord } from '../../../types/index'
1010

@@ -22,7 +22,7 @@ const createSigner = (overrides: Partial<SignerSummaryRecord> = {}): SignerSumma
2222

2323
const usernameToColorMock = vi.fn((_seed: string) => ({ r: 10, g: 20, b: 30 }))
2424

25-
vi.mock('@nextcloud/l10n', () => createL10nMock({
25+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n({
2626
t: (_app: string, text: string, vars?: Record<string, string | number>) => interpolateL10n(text, vars),
2727
n: (_app: string, singular: string, plural: string, count: number, vars?: Record<string, string | number>) => {
2828
const template = count === 1 ? singular : plural

src/tests/components/PreviewSignature/PreviewSignature.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
import { beforeEach, describe, expect, it, vi } from 'vitest'
7-
import { createL10nMock } from '../../testHelpers/l10n.js'
87
import { mount } from '@vue/test-utils'
98

109
import PreviewSignature from '../../../components/PreviewSignature/PreviewSignature.vue'
@@ -28,7 +27,7 @@ vi.mock('@nextcloud/capabilities', () => ({
2827
})),
2928
}))
3029

31-
vi.mock('@nextcloud/l10n', () => createL10nMock())
30+
vi.mock('@nextcloud/l10n', () => globalThis.mockNextcloudL10n())
3231

3332
describe('PreviewSignature.vue', () => {
3433
beforeEach(() => {

0 commit comments

Comments
 (0)