Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/web-app-admin-settings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@ownclouders/design-system": "workspace:^",
"@ownclouders/web-client": "workspace:^",
"@ownclouders/web-pkg": "workspace:^",
"axios": "1.15.0",
"axios": "^1.18.1",
"email-validator": "^2.0.4",
"fuse.js": "7.3.0",
"lodash-es": "4.18.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-app-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@ownclouders/design-system": "workspace:^",
"@ownclouders/web-client": "workspace:*",
"@ownclouders/web-pkg": "workspace:*",
"axios": "1.15.0",
"axios": "^1.18.1",
"fuse.js": "7.3.0",
"lodash-es": "4.18.1",
"mark.js": "^8.11.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@ownclouders/web-pkg": "workspace:*",
"@uppy/core": "5.2.0",
"@vueuse/core": "^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
"axios": "1.15.0",
"axios": "^1.18.1",
"dompurify": "^3.4.2",
"email-validator": "^2.0.4",
"fuse.js": "7.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-ocm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@ownclouders/design-system": "workspace:*",
"@ownclouders/web-client": "workspace:*",
"@ownclouders/web-pkg": "workspace:*",
"axios": "1.15.0",
"axios": "^1.18.1",
"email-validator": "^2.0.4",
"fuse.js": "7.3.0",
"lodash-es": "4.18.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"dependencies": {
"@casl/ability": "^6.8.1",
"@microsoft/fetch-event-source": "^2.0.1",
"axios": "^1.13.6",
"axios": "^1.18.1",
"fast-xml-parser": "^5.8.0",
"lodash-es": "^4.18.1",
"luxon": "^3.7.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-pkg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@vavt/cm-extension": "^1.11.2",
"@vue/shared": "^3.5.29",
"@vueuse/core": "^14.3.0",
"axios": "^1.13.6",
"axios": "^1.18.1",
"deepmerge": "^4.3.1",
"dompurify": "^3.4.2",
"emoji-regex": "^10.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ import DeleteWorker from '../../../../../src/composables/webWorkers/deleteWorker
import { mock } from 'vitest-mock-extended'
import { type WebDAV } from '@ownclouders/web-client/webdav'

let webDavMock: ReturnType<typeof mock<WebDAV>>

vi.mock('@ownclouders/web-client', async (importOriginal) => ({
...(await importOriginal<any>()),
webdav: () => webDavMock
}))

const resourceMock = {
id: 'resourceId',
name: 'resourceName',
Expand All @@ -27,7 +34,6 @@ vi.setConfig({ testTimeout: 20000, hookTimeout: 20000 })

describe('delete worker', () => {
let worker: ReturnType<typeof useWebWorker>
let webDavMock: ReturnType<typeof mock<WebDAV>>

let resolveTest: (value: boolean) => unknown
let workerPromise: Promise<unknown>
Expand All @@ -39,11 +45,6 @@ describe('delete worker', () => {
workerPromise = new Promise((resolve) => {
resolveTest = resolve
})

vi.doMock('@ownclouders/web-client', async (importOriginal) => ({
...(await importOriginal<any>()),
webdav: () => webDavMock
}))
})

afterEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ const createdResourceMock = {
spaceId: '1'
}

let webDavMock: ReturnType<typeof mock<WebDAV>>

vi.mock('@ownclouders/web-client', async (importOriginal) => ({
...(await importOriginal<any>()),
webdav: () => webDavMock
}))

vi.mock('../../../../../src/composables/webWorkers/exportAsPdfWorker/renderer', () => ({
PDFRenderer: vi.fn().mockImplementation(function () {
return {
Expand All @@ -48,7 +55,6 @@ vi.setConfig({ testTimeout: 20000, hookTimeout: 20000 })

describe('export as PDF worker', () => {
let worker: ReturnType<typeof useWebWorker>
let webDavMock: ReturnType<typeof mock<WebDAV>>

let resolveTest: (value: boolean) => unknown
let workerPromise: Promise<unknown>
Expand All @@ -60,11 +66,6 @@ describe('export as PDF worker', () => {
workerPromise = new Promise((resolve) => {
resolveTest = resolve
})

vi.doMock('@ownclouders/web-client', async (importOriginal) => ({
...(await importOriginal<any>()),
webdav: () => webDavMock
}))
})

afterEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ import { TransferType } from '../../../../../src/helpers/resource/conflictHandli
import { mock } from 'vitest-mock-extended'
import type { WebDAV } from '@ownclouders/web-client/webdav'

let webDavMock: ReturnType<typeof mock<WebDAV>>

vi.mock('@ownclouders/web-client', async (importOriginal) => ({
...(await importOriginal<any>()),
webdav: () => webDavMock
}))

const resourceMock = {
id: 'resourceId',
name: 'resourceName'
Expand All @@ -29,8 +36,7 @@ const transferDataMock = {
sourceSpace: sourceSpaceMock,
targetSpace: targetSpaceMock,
targetFolder: targetFolderMock,
path: '',
baseUrl: 'https://example.com'
path: ''
}

// Real web workers can be slow to spin up and reply under heavy CI parallelism;
Expand All @@ -39,7 +45,6 @@ vi.setConfig({ testTimeout: 20000, hookTimeout: 20000 })

describe('paste worker', () => {
let worker: ReturnType<typeof useWebWorker>
let webDavMock: ReturnType<typeof mock<WebDAV>>

let resolveTest: (value: boolean) => unknown
let workerPromise: Promise<unknown>
Expand All @@ -51,11 +56,6 @@ describe('paste worker', () => {
workerPromise = new Promise((resolve) => {
resolveTest = resolve
})

vi.doMock('@ownclouders/web-client', async (importOriginal) => ({
...(await importOriginal<any>()),
webdav: () => webDavMock
}))
})

afterEach(() => {
Expand All @@ -81,6 +81,7 @@ describe('paste worker', () => {
JSON.stringify({
topic: 'startProcess',
data: {
baseUrl: 'https://example.com',
transferData: [{ ...transferDataMock, transferType: TransferType.COPY }]
}
})
Expand All @@ -104,6 +105,7 @@ describe('paste worker', () => {
JSON.stringify({
topic: 'startProcess',
data: {
baseUrl: 'https://example.com',
transferData: [{ ...transferDataMock, transferType: TransferType.MOVE }]
}
})
Expand All @@ -127,6 +129,7 @@ describe('paste worker', () => {
JSON.stringify({
topic: 'startProcess',
data: {
baseUrl: 'https://example.com',
transferData: [{ ...transferDataMock, transferType: TransferType.COPY }]
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ import RestoreWorker from '../../../../../src/composables/webWorkers/restoreWork
import { mock } from 'vitest-mock-extended'
import type { WebDAV } from '@ownclouders/web-client/webdav'

let webDavMock: ReturnType<typeof mock<WebDAV>>

vi.mock('@ownclouders/web-client', async (importOriginal) => ({
...(await importOriginal<any>()),
webdav: () => webDavMock
}))

const resourceMock = {
id: 'resourceId',
name: 'resourceName',
Expand All @@ -27,7 +34,6 @@ vi.setConfig({ testTimeout: 20000, hookTimeout: 20000 })

describe('restore worker', () => {
let worker: ReturnType<typeof useWebWorker>
let webDavMock: ReturnType<typeof mock<WebDAV>>

let resolveTest: (value: boolean) => unknown
let workerPromise: Promise<unknown>
Expand All @@ -39,11 +45,6 @@ describe('restore worker', () => {
workerPromise = new Promise((resolve) => {
resolveTest = resolve
})

vi.doMock('@ownclouders/web-client', async (importOriginal) => ({
...(await importOriginal<any>()),
webdav: () => webDavMock
}))
})

afterEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion packages/web-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@uppy/xhr-upload": "5.2.0",
"@vueuse/core": "14.3.0",
"@vueuse/head": "2.0.0",
"axios": "1.15.0",
"axios": "^1.18.1",
"deepmerge": "4.3.1",
"email-validator": "2.0.4",
"dompurify": "^3.4.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-test-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@ownclouders/design-system": "workspace:^",
"@ownclouders/web-client": "workspace:^",
"@pinia/testing": "^1.0.3",
"axios": "1.15.0",
"axios": "^1.18.1",
"vitest-mock-extended": "3.1.1",
"vue-router": "5.0.6",
"vue3-gettext": "2.4.0"
Expand Down
Loading
Loading