From 733eb0ea58dc43ba89ba4d75fcb3f38ffa738780 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 23:39:41 +0000 Subject: [PATCH 1/2] build(deps): Bump @nextcloud/router from 2.2.0 to 3.0.0 Bumps [@nextcloud/router](https://github.com/nextcloud/nextcloud-router) from 2.2.0 to 3.0.0. - [Release notes](https://github.com/nextcloud/nextcloud-router/releases) - [Changelog](https://github.com/nextcloud-libraries/nextcloud-router/blob/master/CHANGELOG.md) - [Commits](https://github.com/nextcloud/nextcloud-router/compare/v2.2.0...v3.0.0) --- updated-dependencies: - dependency-name: "@nextcloud/router" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 80 ++++++++++++++++++++--------------------------- package.json | 6 ++-- 2 files changed, 37 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index c636a6da..7630dec6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,12 +12,12 @@ "@nextcloud/auth": "^2.2.1", "@nextcloud/axios": "^2.4.0", "@nextcloud/dialogs": "^5.2.0", - "@nextcloud/files": "^3.1.0", + "@nextcloud/files": "^3.1.1", "@nextcloud/l10n": "^2.2.0", "@nextcloud/logger": "^2.7.0", "@nextcloud/moment": "^1.3.1", "@nextcloud/paths": "^2.1.0", - "@nextcloud/router": "^2.2.0", + "@nextcloud/router": "^3.0.0", "axios": "^1.6.8", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", @@ -30,7 +30,7 @@ "@cypress/vue2": "^2.1.0", "@nextcloud/eslint-config": "^8.3.0", "@nextcloud/vite-config": "^1.2.2", - "@tsconfig/cypress": "^1.0.1", + "@tsconfig/cypress": "^1.0.2", "@types/node": "^20.11.30", "@vitest/coverage-istanbul": "^1.2.1", "@vue/tsconfig": "^0.5.1", @@ -3514,6 +3514,19 @@ "npm": "^9.0.0" } }, + "node_modules/@nextcloud/axios/node_modules/@nextcloud/router": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.2.1.tgz", + "integrity": "sha512-ZRc/WI0RaksEJMz08H/6LimIdP+1A1xTHThCYEghs7VgAKNp5917vT2OKSpG0cMRbIwk0ongFVt5FB5qjy/iFg==", + "dependencies": { + "@nextcloud/typings": "^1.7.0", + "core-js": "^3.6.4" + }, + "engines": { + "node": "^20.0.0", + "npm": "^10.0.0" + } + }, "node_modules/@nextcloud/browser-storage": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@nextcloud/browser-storage/-/browser-storage-0.3.0.tgz", @@ -3662,18 +3675,6 @@ "vue": "^2.7.16" } }, - "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/router": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-3.0.0.tgz", - "integrity": "sha512-RlPrOPw94yT9rmt3+2sUs2cmWzqhX5eFW+i/EHymJEKgURVtnqCcXjIcAiLTfgsCCdAS1hGapBL8j8rhHk1FHQ==", - "dependencies": { - "@nextcloud/typings": "^1.7.0" - }, - "engines": { - "node": "^20.0.0", - "npm": "^10.0.0" - } - }, "node_modules/@nextcloud/eslint-config": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/@nextcloud/eslint-config/-/eslint-config-8.3.0.tgz", @@ -3778,18 +3779,6 @@ "npm": "^9.0.0" } }, - "node_modules/@nextcloud/files/node_modules/@nextcloud/router": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-3.0.0.tgz", - "integrity": "sha512-RlPrOPw94yT9rmt3+2sUs2cmWzqhX5eFW+i/EHymJEKgURVtnqCcXjIcAiLTfgsCCdAS1hGapBL8j8rhHk1FHQ==", - "dependencies": { - "@nextcloud/typings": "^1.7.0" - }, - "engines": { - "node": "^20.0.0", - "npm": "^10.0.0" - } - }, "node_modules/@nextcloud/initial-state": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.1.0.tgz", @@ -3815,6 +3804,19 @@ "npm": "^9.0.0" } }, + "node_modules/@nextcloud/l10n/node_modules/@nextcloud/router": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.2.1.tgz", + "integrity": "sha512-ZRc/WI0RaksEJMz08H/6LimIdP+1A1xTHThCYEghs7VgAKNp5917vT2OKSpG0cMRbIwk0ongFVt5FB5qjy/iFg==", + "dependencies": { + "@nextcloud/typings": "^1.7.0", + "core-js": "^3.6.4" + }, + "engines": { + "node": "^20.0.0", + "npm": "^10.0.0" + } + }, "node_modules/@nextcloud/logger": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/@nextcloud/logger/-/logger-2.7.0.tgz", @@ -3859,16 +3861,15 @@ } }, "node_modules/@nextcloud/router": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.2.0.tgz", - "integrity": "sha512-M4AVGnB5tt3MYO5RpH/R2jq7z/nW05AmRhk4Lh68krVwRIYGo8pgNikKrPGogHd2Q3UgzF5Py1drHz3uuV99bQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-3.0.0.tgz", + "integrity": "sha512-RlPrOPw94yT9rmt3+2sUs2cmWzqhX5eFW+i/EHymJEKgURVtnqCcXjIcAiLTfgsCCdAS1hGapBL8j8rhHk1FHQ==", "dependencies": { - "@nextcloud/typings": "^1.7.0", - "core-js": "^3.6.4" + "@nextcloud/typings": "^1.7.0" }, "engines": { "node": "^20.0.0", - "npm": "^9.0.0" + "npm": "^10.0.0" } }, "node_modules/@nextcloud/typings": { @@ -3978,19 +3979,6 @@ "vue": "2.x" } }, - "node_modules/@nextcloud/vue/node_modules/@nextcloud/router": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-3.0.0.tgz", - "integrity": "sha512-RlPrOPw94yT9rmt3+2sUs2cmWzqhX5eFW+i/EHymJEKgURVtnqCcXjIcAiLTfgsCCdAS1hGapBL8j8rhHk1FHQ==", - "peer": true, - "dependencies": { - "@nextcloud/typings": "^1.7.0" - }, - "engines": { - "node": "^20.0.0", - "npm": "^10.0.0" - } - }, "node_modules/@nextcloud/vue/node_modules/@types/unist": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.0.tgz", diff --git a/package.json b/package.json index ae610fde..22cdd984 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@cypress/vue2": "^2.1.0", "@nextcloud/eslint-config": "^8.3.0", "@nextcloud/vite-config": "^1.2.2", - "@tsconfig/cypress": "^1.0.1", + "@tsconfig/cypress": "^1.0.2", "@types/node": "^20.11.30", "@vitest/coverage-istanbul": "^1.2.1", "@vue/tsconfig": "^0.5.1", @@ -73,12 +73,12 @@ "@nextcloud/auth": "^2.2.1", "@nextcloud/axios": "^2.4.0", "@nextcloud/dialogs": "^5.2.0", - "@nextcloud/files": "^3.1.0", + "@nextcloud/files": "^3.1.1", "@nextcloud/l10n": "^2.2.0", "@nextcloud/logger": "^2.7.0", "@nextcloud/moment": "^1.3.1", "@nextcloud/paths": "^2.1.0", - "@nextcloud/router": "^2.2.0", + "@nextcloud/router": "^3.0.0", "axios": "^1.6.8", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", From b2ba4a79cb724e2aff60161ecc2b017d8e47187a Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 23 Feb 2024 01:11:39 +0100 Subject: [PATCH 2/2] fix: Adjust tests - we need either a real webroot or mock `_oc_webroot` Signed-off-by: Ferdinand Thiessen --- __tests__/utils/upload.spec.ts | 8 ++++---- cypress/support/component-index.html | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/__tests__/utils/upload.spec.ts b/__tests__/utils/upload.spec.ts index e9758fef..5fc6aeae 100644 --- a/__tests__/utils/upload.spec.ts +++ b/__tests__/utils/upload.spec.ts @@ -62,7 +62,7 @@ describe('Initialize chunks upload temporary workspace', () => { // mock the current location for our assert on the URL Object.defineProperty(window, 'location', { - value: new URL('https://cloud.domain.com'), + value: new URL('https://cloud.domain.com/index.php/apps/test'), configurable: true, }) @@ -71,7 +71,7 @@ describe('Initialize chunks upload temporary workspace', () => { const url = await initChunkWorkspace() - expect(url.startsWith('https://cloud.domain.com/remote.php/dav/uploads/test/web-file-upload-')).toBe(true) + expect(url).toMatch('https://cloud.domain.com/remote.php/dav/uploads/test/web-file-upload-') expect(url.length).toEqual('https://cloud.domain.com/remote.php/dav/uploads/test/web-file-upload-123456789abcdefg'.length) expect(axiosMock.request).toHaveBeenCalledTimes(1) @@ -86,7 +86,7 @@ describe('Initialize chunks upload temporary workspace', () => { // mock the current location for our assert on the URL Object.defineProperty(window, 'location', { - value: new URL('https://cloud.domain.com'), + value: new URL('https://cloud.domain.com/index.php/apps/test'), configurable: true, }) @@ -95,7 +95,7 @@ describe('Initialize chunks upload temporary workspace', () => { const url = await initChunkWorkspace('https://cloud.domain.com/remote.php/dav/files/test/image.jpg') - expect(url.startsWith('https://cloud.domain.com/remote.php/dav/uploads/test/web-file-upload-')).toBe(true) + expect(url).toMatch('https://cloud.domain.com/remote.php/dav/uploads/test/web-file-upload-') expect(url.length).toEqual('https://cloud.domain.com/remote.php/dav/uploads/test/web-file-upload-123456789abcdefg'.length) expect(axiosMock.request).toHaveBeenCalledTimes(1) diff --git a/cypress/support/component-index.html b/cypress/support/component-index.html index 84ab8500..39a10c06 100644 --- a/cypress/support/component-index.html +++ b/cypress/support/component-index.html @@ -9,6 +9,9 @@