Skip to content

Commit 6967c75

Browse files
dependabot[bot]juliusknorr
dependabot[bot]
authored and
juliusknorr
committed
chore(deps-dev): Bump cypress from 13.17.0 to 15.10.0
Bumps [cypress](https://github.com/cypress-io/cypress) from 13.17.0 to 15.10.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](cypress-io/cypress@v13.17.0...v15.10.0) --- updated-dependencies: - dependency-name: cypress dependency-version: 15.10.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent 4c55444 commit 6967c75

11 files changed

Lines changed: 1418 additions & 15038 deletions

‎cypress.config.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import { defineConfig } from 'cypress'
66

77
export default defineConfig({
8-
collaboraUrl: 'https://localhost:9980/',
8+
env: {
9+
collaboraUrl: process.env.CYPRESS_collaboraUrl ?? 'https://localhost:9980/',
10+
},
911
projectId: 'fef71b',
1012
viewportWidth: 1280,
1113
viewportHeight: 720,

‎cypress/e2e/direct.spec.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5+
const baseUrl = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')
6+
57
const getTemplates = (user, type) => {
68
return cy.request({
79
method: 'GET',
8-
url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/richdocuments/api/v1/templates/${type}?format=json`,
10+
url: `${baseUrl}/ocs/v2.php/apps/richdocuments/api/v1/templates/${type}?format=json`,
911
auth: { user: user.userId, pass: user.password },
1012
headers: {
1113
'OCS-ApiRequest': 'true',
@@ -22,7 +24,7 @@ const createDirectEditingLink = (user, fileId) => {
2224
cy.login(user)
2325
return cy.request({
2426
method: 'POST',
25-
url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/richdocuments/api/v1/document?format=json`,
27+
url: `${baseUrl}/ocs/v2.php/apps/richdocuments/api/v1/document?format=json`,
2628
form: true,
2729
body: {
2830
fileId,
@@ -44,7 +46,7 @@ const createNewFileDirectEditingLink = (user, path, template) => {
4446
cy.login(user)
4547
return cy.request({
4648
method: 'POST',
47-
url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/richdocuments/api/v1/templates/new?format=json`,
49+
url: `${baseUrl}/ocs/v2.php/apps/richdocuments/api/v1/templates/new?format=json`,
4850
form: true,
4951
body: {
5052
path, template,
@@ -66,7 +68,7 @@ const createDirectEditingLinkForShareToken = (shareToken, host = undefined, path
6668
cy.logout()
6769
return cy.request({
6870
method: 'POST',
69-
url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/richdocuments/api/v1/share?format=json`,
71+
url: `${baseUrl}/ocs/v2.php/apps/richdocuments/api/v1/share?format=json`,
7072
form: true,
7173
body: {
7274
shareToken,

‎cypress/e2e/settings.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
import { User } from '@nextcloud/cypress'
5+
import { User } from '@nextcloud/e2e-test-server/cypress'
66

7-
const usesHttps = Cypress.env('baseUrl').substr(0, 5) === 'https'
7+
const usesHttps = Cypress.config('baseUrl').startsWith('https')
88
const collaboraUrl = Cypress.env('collaboraUrl')
99
const defaultFonts = ['AmaticSC-Regular.ttf']
1010

‎cypress/e2e/share-federated.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
import { User } from '@nextcloud/cypress'
5+
import { User } from '@nextcloud/e2e-test-server/cypress'
66
import { randHash } from '../utils/index.js'
77
const shareOwner = new User(randHash(), randHash())
88
const shareRecipient = new User(randHash(), randHash())

‎cypress/e2e/share-internal.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
import { User } from '@nextcloud/cypress'
5+
import { User } from '@nextcloud/e2e-test-server/cypress'
66
import { randHash } from '../utils/index.js'
77
const shareOwner = new User(randHash(), randHash())
88
const shareRecipient = new User(randHash(), randHash())

‎cypress/e2e/share-link.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
import { User } from '@nextcloud/cypress'
5+
import { User } from '@nextcloud/e2e-test-server/cypress'
66
import { randHash } from '../utils/index.js'
77

88
const shareOwner = new User(randHash(), randHash())

‎cypress/e2e/templates.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import {User} from "@nextcloud/cypress";
6+
import {User} from "@nextcloud/e2e-test-server/cypress";
77

88
describe('Global templates', function() {
99

‎cypress/plugins/index.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@
1616
* SPDX-License-Identifier: AGPL-3.0-or-later
1717
*/
1818
const cypressSplit = require('cypress-split')
19-
const browserify = require('@cypress/browserify-preprocessor')
20-
const webpack = require('@cypress/webpack-preprocessor')
21-
const webpackOptions = require('@nextcloud/webpack-vue-config')
19+
const webpackPreprocessor = require('@cypress/webpack-batteries-included-preprocessor')
2220

2321
module.exports = (on, config) => {
2422
cypressSplit(on, config)
2523

26-
on('file:preprocessor', browserify())
27-
on('file:preprocessor', webpack({ webpackOptions }))
24+
on('file:preprocessor', webpackPreprocessor())
2825

2926
return config
3027
}

‎cypress/support/commands.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
*/
55
import { basename } from 'path'
66
import axios from '@nextcloud/axios'
7-
import { User, addCommands } from '@nextcloud/cypress'
7+
import { User, addCommands } from '@nextcloud/e2e-test-server/cypress'
88

99
addCommands()
1010

1111
const url = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')
12-
Cypress.env('baseUrl', url)
1312

1413
Cypress.Commands.add('logout', (route = '/') => {
1514
cy.session('_guest', function() {
@@ -18,7 +17,7 @@ Cypress.Commands.add('logout', (route = '/') => {
1817

1918
Cypress.Commands.add('createFolder', (user, target) => {
2019
cy.login(user)
21-
const rootPath = `${Cypress.env('baseUrl')}/remote.php/dav/files/${encodeURIComponent(user.userId)}`
20+
const rootPath = `${url}/remote.php/dav/files/${encodeURIComponent(user.userId)}`
2221
const dirPath = target.split('/').map(encodeURIComponent).join('/')
2322

2423
return cy.request('/csrftoken')
@@ -52,7 +51,7 @@ Cypress.Commands.add('uploadFile', (user, fixture, mimeType, target = `/${fixtur
5251
const blob = Cypress.Blob.base64StringToBlob(file, mimeType)
5352

5453
// Process paths
55-
const rootPath = `${Cypress.env('baseUrl')}/remote.php/dav/files/${encodeURIComponent(user.userId)}`
54+
const rootPath = `${url}/remote.php/dav/files/${encodeURIComponent(user.userId)}`
5655
const filePath = target.split('/').map(encodeURIComponent).join('/')
5756
try {
5857
const file = new File([blob], fileName, { type: mimeType })
@@ -189,7 +188,7 @@ Cypress.Commands.add('nextcloudEnableApp', (appId) => {
189188
cy.login(new User('admin', 'admin'))
190189
cy.request({
191190
method: 'POST',
192-
url: `${Cypress.env('baseUrl')}/ocs/v1.php/cloud/apps/${appId}?format=json`,
191+
url: `${url}/ocs/v1.php/cloud/apps/${appId}?format=json`,
193192
form: true,
194193
auth: { user: 'admin', pass: 'admin' },
195194
headers: {
@@ -209,7 +208,7 @@ Cypress.Commands.add('setPersonalTemplateFolder', (user, templateFolder) => {
209208
.then(({ body }) => body.token)
210209
.then(requesttoken => {
211210
return cy.request({
212-
url: `${Cypress.env('baseUrl')}/index.php/apps/richdocuments/ajax/personal.php`,
211+
url: `${url}/index.php/apps/richdocuments/ajax/personal.php`,
213212
method: 'POST',
214213
headers: {
215214
requesttoken,
@@ -224,7 +223,7 @@ Cypress.Commands.add('nextcloudTestingAppConfigSet', (appId, configKey, configVa
224223
cy.login(new User('admin', 'admin'))
225224
cy.request({
226225
method: 'POST',
227-
url: `${Cypress.env('baseUrl')}/ocs/v1.php/apps/testing/api/v1/app/${appId}/${configKey}?format=json`,
226+
url: `${url}/ocs/v1.php/apps/testing/api/v1/app/${appId}/${configKey}?format=json`,
228227
auth: { user: 'admin', pass: 'admin' },
229228
headers: {
230229
'OCS-ApiRequest': 'true',
@@ -381,7 +380,7 @@ Cypress.Commands.add('verifyTemplateFields', (fields, fileId) => {
381380
cy.get('@requestToken').then(requesttoken => {
382381
cy.request({
383382
method: 'GET',
384-
url: Cypress.env('baseUrl') + apiEndpoint + fileId + '?format=json',
383+
url: url + apiEndpoint + fileId + '?format=json',
385384
headers: {
386385
requesttoken,
387386
},

0 commit comments

Comments
 (0)