diff --git a/packages/web-app-admin-settings/tests/unit/components/AppTemplate.spec.ts b/packages/web-app-admin-settings/tests/unit/components/AppTemplate.spec.ts index acfdd0d7e17..afed1d203e7 100644 --- a/packages/web-app-admin-settings/tests/unit/components/AppTemplate.spec.ts +++ b/packages/web-app-admin-settings/tests/unit/components/AppTemplate.spec.ts @@ -136,7 +136,6 @@ function getWrapper({ propsData = {} } = {}) { }, mocks: { ...defaultComponentMocks({ - gettext: false, currentRoute: mock({ query: { app: 'admin-settings' } }) }) } diff --git a/packages/web-app-external/tests/unit/app.spec.ts b/packages/web-app-external/tests/unit/app.spec.ts index 348d280796f..9b3a80d435c 100644 --- a/packages/web-app-external/tests/unit/app.spec.ts +++ b/packages/web-app-external/tests/unit/app.spec.ts @@ -145,7 +145,6 @@ function createShallowMountWrapper(makeRequest = jest.fn().mockResolvedValue({ s stubs: componentStubs, mocks: { ...defaultComponentMocks({ - gettext: false, currentRoute: mock({ query: { app: 'exampleApp' } }) }) } diff --git a/packages/web-app-files/tests/unit/components/AppBar/AppBar.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/AppBar.spec.ts index 709ea33a647..fc321223ddb 100644 --- a/packages/web-app-files/tests/unit/components/AppBar/AppBar.spec.ts +++ b/packages/web-app-files/tests/unit/components/AppBar/AppBar.spec.ts @@ -127,7 +127,6 @@ function getShallowWrapper( } ) { const mocks = defaultComponentMocks({ - gettext: false, currentRoute: mock({ name: 'files-trash-generic' }) }) mocks.$route.meta.title = 'ExampleTitle' diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/__snapshots__/ListItem.spec.ts.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/__snapshots__/ListItem.spec.ts.snap index 1e23e045dc1..8f1e2f8af13 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/__snapshots__/ListItem.spec.ts.snap +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/__snapshots__/ListItem.spec.ts.snap @@ -10,7 +10,7 @@ exports[`Collaborator ListItem component share inheritance indicators show when
- Share receiver name: %{ displayName } (%{ additionalInfo }) + Share receiver name: Brian Murphy (brian@owncloud.com)
diff --git a/packages/web-app-files/tests/unit/mixins/actions/rename.spec.ts b/packages/web-app-files/tests/unit/mixins/actions/rename.spec.ts index 1f3e4419bda..05006d74258 100644 --- a/packages/web-app-files/tests/unit/mixins/actions/rename.spec.ts +++ b/packages/web-app-files/tests/unit/mixins/actions/rename.spec.ts @@ -80,22 +80,23 @@ describe('rename', () => { { currentName: 'currentName', newName: 'file1', - message: 'The name "%{name}" is already taken' + message: 'The name "file1" is already taken' }, { currentName: 'currentName', newName: 'newname', parentResources: [{ name: 'newname', path: '/newname' }], - message: 'The name "%{name}" is already taken' + message: 'The name "newname" is already taken' } ])('should detect name errors and display error messages accordingly', (inputData) => { - const { mocks, wrapper } = getWrapper() + const { wrapper } = getWrapper() + const errorModalSpy = jest.spyOn(wrapper.vm, 'setModalInputErrorMessage') wrapper.vm.$_rename_checkNewName( { name: inputData.currentName, path: `/${inputData.currentName}` }, inputData.newName, inputData.parentResources ) - expect(mocks.$gettext).toHaveBeenCalledWith(inputData.message) + expect(errorModalSpy).toHaveBeenCalledWith(inputData.message) }) }) diff --git a/packages/web-runtime/tests/unit/components/UploadInfo.spec.ts b/packages/web-runtime/tests/unit/components/UploadInfo.spec.ts index bfdefd7b869..0d13f029354 100644 --- a/packages/web-runtime/tests/unit/components/UploadInfo.spec.ts +++ b/packages/web-runtime/tests/unit/components/UploadInfo.spec.ts @@ -237,7 +237,7 @@ function getShallowWrapper({ inFinalization = false } = {}) { const mocks = { - ...defaultComponentMocks({ gettext: false }) + ...defaultComponentMocks() } const storeOptions = { ...defaultStoreMockOptions diff --git a/packages/web-test-helpers/src/mocks/defaultComponentMocks.ts b/packages/web-test-helpers/src/mocks/defaultComponentMocks.ts index d11885fb334..950a0b23321 100644 --- a/packages/web-test-helpers/src/mocks/defaultComponentMocks.ts +++ b/packages/web-test-helpers/src/mocks/defaultComponentMocks.ts @@ -6,14 +6,10 @@ import { OwnCloudSdk } from 'web-client/src/types' import { ref } from 'vue' export interface ComponentMocksOptions { - gettext?: boolean currentRoute?: RouteLocation } -export const defaultComponentMocks = ({ - gettext = true, - currentRoute = undefined -}: ComponentMocksOptions = {}) => { +export const defaultComponentMocks = ({ currentRoute = undefined }: ComponentMocksOptions = {}) => { const $router = mockDeep({ ...(currentRoute && { currentRoute: ref(currentRoute) }) }) $router.resolve.mockImplementation( (to: RouteLocationRaw) => ({ href: (to as any).name, location: { path: '' } } as any) @@ -26,12 +22,6 @@ export const defaultComponentMocks = ({ $route, $clientService: mockDeep(), $client: mockDeep(), - $uppyService: mockDeep(), - ...(gettext && { - $gettextInterpolate: jest.fn((text) => text), - $ngettext: jest.fn((text) => text), - $pgettext: jest.fn((text) => text), - $gettext: jest.fn((text) => text) - }) + $uppyService: mockDeep() } }