Skip to content

Commit

Permalink
Merge pull request #4404 from nextcloud/renovate/stable26-nextcloud-e…
Browse files Browse the repository at this point in the history
…slint-config-8.x
  • Loading branch information
juliusknorr authored Jun 28, 2023
2 parents a46780e + 7fbf05e commit c6f7279
Show file tree
Hide file tree
Showing 31 changed files with 1,057 additions and 322 deletions.
1 change: 0 additions & 1 deletion cypress/e2e/share.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net>
*
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/shortcuts.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('keyboard shortcuts', () => {
cy.uploadFile(
'empty.md',
'text/markdown',
path
path,
)
cy.window().then(win => win.OCA.Viewer.open({ path }))
cy.getContent().type(Cypress.currentTest.title)
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/chai.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default _chai => {
rect.top < height && rect.bottom > 0 && rect.right <= width && rect.left >= 0,
'expected #{this} to be in the viewport',
'expected #{this} to not be in the viewport',
this._obj
this._obj,
)
})
}
18 changes: 9 additions & 9 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ Cypress.Commands.add('uploadFile', (fileName, mimeType, target) => {
})
}).then(response => {
const fileId = Number(
response.headers['oc-fileid']?.split('oc')?.[0]
response.headers['oc-fileid']?.split('oc')?.[0],
)
cy.log(`Uploaded ${fileName}`,
response.status,
{ fileId }
{ fileId },
)
return cy.wrap(fileId)
})
Expand Down Expand Up @@ -194,7 +194,7 @@ Cypress.Commands.add('shareFile', (path, options = {}) => {
const request = await axios.post(
`${url}/ocs/v2.php/apps/files_sharing/api/v1/shares`,
{ path, shareType },
{ headers }
{ headers },
)
const token = request.data?.ocs?.data?.token
const id = request.data?.ocs?.data?.id
Expand All @@ -210,7 +210,7 @@ Cypress.Commands.add('shareFile', (path, options = {}) => {
await axios.put(
`${url}/ocs/v2.php/apps/files_sharing/api/v1/shares/${id}`,
{ permissions },
{ headers }
{ headers },
)
cy.log(`Made share ${token} editable.`)
}
Expand All @@ -237,15 +237,15 @@ Cypress.Commands.add('createFolder', (target) => {
})

Cypress.Commands.add('moveFile', (path, destinationPath) => cy.window()
.then(win => win.OC.Files.getClient().move(path, destinationPath))
.then(win => win.OC.Files.getClient().move(path, destinationPath)),
)

Cypress.Commands.add('removeFile', (path) => cy.window()
.then(win => win.OC.Files.getClient().remove(path))
.then(win => win.OC.Files.getClient().remove(path)),
)

Cypress.Commands.add('copyFile', (path, destinationPath) => cy.window()
.then(win => win.OC.Files.getClient().copy(path, destinationPath))
.then(win => win.OC.Files.getClient().copy(path, destinationPath)),
)

Cypress.Commands.add('getFileContent', (path) => {
Expand Down Expand Up @@ -285,7 +285,7 @@ Cypress.Commands.add('propfindFolder', (path, depth = 0) => {
})

Cypress.Commands.add('reloadFileList', () => cy.window()
.then(win => win.OCA?.Files?.App?.fileList?.reload())
.then(win => win.OCA?.Files?.App?.fileList?.reload()),
)

Cypress.Commands.add('openFolder', (name) => {
Expand Down Expand Up @@ -391,7 +391,7 @@ Cypress.Commands.add('configureText', (key, value) => {
return axios.post(
`${url}/index.php/apps/text/settings`,
{ key, value },
{ headers: { requesttoken: win.OC.requestToken } }
{ headers: { requesttoken: win.OC.requestToken } },
)
})
})
Expand Down
4 changes: 2 additions & 2 deletions js/editor-collab.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor-collab.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-editors.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-editors.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit c6f7279

Please sign in to comment.