Skip to content
Open
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
22 changes: 21 additions & 1 deletion apps/files/src/services/DropServiceUtils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,24 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import type * as NextcloudFilesDav from '@nextcloud/files/dav'

import { Folder } from '@nextcloud/files'
import { getClient } from '@nextcloud/files/dav'
import { join } from 'node:path'
import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
import { DataTransferItem as DataTransferItemMock, FileSystemDirectoryEntry, fileSystemEntryToDataTransferItem, FileSystemFileEntry } from '../../../../__tests__/FileSystemAPIUtils.ts'
import { logger } from '../utils/logger.ts'
import { newNodeName } from '../utils/newNodeDialog.ts'
import { dataTransferToFileTree } from './DropService.ts'
import { Directory, renameInvalidDroppedEntries, traverseTree } from './DropServiceUtils.ts'
import { createDirectoryIfNotExists, Directory, renameInvalidDroppedEntries, traverseTree } from './DropServiceUtils.ts'

vi.mock('@nextcloud/dialogs')
vi.mock('../utils/newNodeDialog.ts')
vi.mock('@nextcloud/files/dav', async (importOriginal) => ({
...await importOriginal<typeof NextcloudFilesDav>(),
getClient: vi.fn(),
}))
vi.mock('@nextcloud/capabilities', () => ({
getCapabilities: () => ({
files: {
Expand Down Expand Up @@ -251,3 +259,15 @@ describe('DropService dataTransferToFileTree', () => {
expect(showWarning).toHaveBeenCalledTimes(1)
})
})

describe('createDirectoryIfNotExists', () => {
it('Should encode the hash character of the destination', async () => {
const davClient = { exists: vi.fn().mockResolvedValue(true) }
vi.mocked(getClient).mockReturnValue(davClient as unknown as ReturnType<typeof getClient>)

const destination = new Folder({ owner: 'admin', root: '/files/admin', source: 'https://cloud.example.com/remote.php/dav/files/admin/#test' })
await createDirectoryIfNotExists('ACC', destination)

expect(getClient).toHaveBeenCalledWith('https://cloud.example.com/remote.php/dav/files/admin/%23test')
})
})
2 changes: 1 addition & 1 deletion apps/files/src/services/DropServiceUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ function readDirectory(directory: FileSystemDirectoryEntry): Promise<FileSystemE
* non-default locations like team folders.
*/
export async function createDirectoryIfNotExists(path: string, destination?: IFolder) {
const davUrl = destination?.source ?? join(defaultRemoteURL, defaultRootPath)
const davUrl = destination?.encodedSource ?? join(defaultRemoteURL, defaultRootPath)
const davRoot = destination?.root ?? defaultRootPath
const davClient = getClient(davUrl)
const dirExists = await davClient.exists(path)
Expand Down