Skip to content

[stable31] chore(deps-dev): bump cypress #5720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elzody wants to merge 1 commit into
base: stable31
Choose a base branch
from
+3,166 −2,961
Open

[stable31] chore(deps-dev): bump cypress #5720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import { defineConfig } from 'cypress'

export default defineConfig({
collaboraUrl: 'https://localhost:9980/',
env: {
collaboraUrl: process.env.CYPRESS_collaboraUrl ?? 'https://localhost:9980/',
},
projectId: 'fef71b',
viewportWidth: 1280,
viewportHeight: 720,
Expand Down
10 changes: 6 additions & 4 deletions cypress/e2e/direct.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
const baseUrl = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')

const getTemplates = (user, type) => {
return cy.request({
method: 'GET',
url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/richdocuments/api/v1/templates/${type}?format=json`,
url: `${baseUrl}/ocs/v2.php/apps/richdocuments/api/v1/templates/${type}?format=json`,
auth: { user: user.userId, pass: user.password },
headers: {
'OCS-ApiRequest': 'true',
Expand All @@ -22,7 +24,7 @@ const createDirectEditingLink = (user, fileId) => {
cy.login(user)
return cy.request({
method: 'POST',
url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/richdocuments/api/v1/document?format=json`,
url: `${baseUrl}/ocs/v2.php/apps/richdocuments/api/v1/document?format=json`,
form: true,
body: {
fileId,
Expand All @@ -44,7 +46,7 @@ const createNewFileDirectEditingLink = (user, path, template) => {
cy.login(user)
return cy.request({
method: 'POST',
url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/richdocuments/api/v1/templates/new?format=json`,
url: `${baseUrl}/ocs/v2.php/apps/richdocuments/api/v1/templates/new?format=json`,
form: true,
body: {
path, template,
Expand All @@ -66,7 +68,7 @@ const createDirectEditingLinkForShareToken = (shareToken, host = undefined, path
cy.logout()
return cy.request({
method: 'POST',
url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/richdocuments/api/v1/share?format=json`,
url: `${baseUrl}/ocs/v2.php/apps/richdocuments/api/v1/share?format=json`,
form: true,
body: {
shareToken,
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/settings.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { User } from '@nextcloud/cypress'
import { User } from '@nextcloud/e2e-test-server/cypress'

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

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/share-federated.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { User } from '@nextcloud/cypress'
import { User } from '@nextcloud/e2e-test-server/cypress'
import { randHash } from '../utils/index.js'
const shareOwner = new User(randHash(), randHash())
const shareRecipient = new User(randHash(), randHash())
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/share-internal.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { User } from '@nextcloud/cypress'
import { User } from '@nextcloud/e2e-test-server/cypress'
import { randHash } from '../utils/index.js'
const shareOwner = new User(randHash(), randHash())
const shareRecipient = new User(randHash(), randHash())
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/share-link.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-FileCopyrightText: 2023 Julius Härtl <jus@bitgrid.net>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { User } from '@nextcloud/cypress'
import { User } from '@nextcloud/e2e-test-server/cypress'
import { randHash } from '../utils/index.js'

const shareOwner = new User(randHash(), randHash())
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/templates.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

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

describe('Global templates', function() {

Expand Down
7 changes: 2 additions & 5 deletions cypress/plugins/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
const cypressSplit = require('cypress-split')
const browserify = require('@cypress/browserify-preprocessor')
const webpack = require('@cypress/webpack-preprocessor')
const webpackOptions = require('@nextcloud/webpack-vue-config')
const webpackPreprocessor = require('@cypress/webpack-batteries-included-preprocessor')

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

on('file:preprocessor', browserify())
on('file:preprocessor', webpack({ webpackOptions }))
on('file:preprocessor', webpackPreprocessor())

return config
}
15 changes: 7 additions & 8 deletions cypress/support/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
*/
import { basename } from 'path'
import axios from '@nextcloud/axios'
import { User, addCommands } from '@nextcloud/cypress'
import { User, addCommands } from '@nextcloud/e2e-test-server/cypress'

addCommands()

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

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

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

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

// Process paths
const rootPath = `${Cypress.env('baseUrl')}/remote.php/dav/files/${encodeURIComponent(user.userId)}`
const rootPath = `${url}/remote.php/dav/files/${encodeURIComponent(user.userId)}`
const filePath = target.split('/').map(encodeURIComponent).join('/')
try {
const file = new File([blob], fileName, { type: mimeType })
Expand Down Expand Up @@ -189,7 +188,7 @@ Cypress.Commands.add('nextcloudEnableApp', (appId) => {
cy.login(new User('admin', 'admin'))
cy.request({
method: 'POST',
url: `${Cypress.env('baseUrl')}/ocs/v1.php/cloud/apps/${appId}?format=json`,
url: `${url}/ocs/v1.php/cloud/apps/${appId}?format=json`,
form: true,
auth: { user: 'admin', pass: 'admin' },
headers: {
Expand All @@ -209,7 +208,7 @@ Cypress.Commands.add('setPersonalTemplateFolder', (user, templateFolder) => {
.then(({ body }) => body.token)
.then(requesttoken => {
return cy.request({
url: `${Cypress.env('baseUrl')}/index.php/apps/richdocuments/ajax/personal.php`,
url: `${url}/index.php/apps/richdocuments/ajax/personal.php`,
method: 'POST',
headers: {
requesttoken,
Expand All @@ -224,7 +223,7 @@ Cypress.Commands.add('nextcloudTestingAppConfigSet', (appId, configKey, configVa
cy.login(new User('admin', 'admin'))
cy.request({
method: 'POST',
url: `${Cypress.env('baseUrl')}/ocs/v1.php/apps/testing/api/v1/app/${appId}/${configKey}?format=json`,
url: `${url}/ocs/v1.php/apps/testing/api/v1/app/${appId}/${configKey}?format=json`,
auth: { user: 'admin', pass: 'admin' },
headers: {
'OCS-ApiRequest': 'true',
Expand Down Expand Up @@ -404,7 +403,7 @@ Cypress.Commands.add('verifyTemplateFields', (fields, fileId) => {
cy.get('@requestToken').then(requesttoken => {
cy.request({
method: 'GET',
url: Cypress.env('baseUrl') + apiEndpoint + fileId + '?format=json',
url: url + apiEndpoint + fileId + '?format=json',
headers: {
requesttoken,
},
Expand Down
Loading
Loading