Skip to content
Merged
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
5 changes: 1 addition & 4 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [14]
node-version: [16]
containers: [1, 2, 3, 4]
php-versions: [ '7.4' ]
databases: [ 'sqlite' ]
Expand All @@ -31,9 +31,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- name: Set up npm7
run: npm i -g npm@7

- name: Checkout server
uses: actions/checkout@v3
with:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: 14.x
- name: Set up npm7
run: npm i -g npm@7
node-version: 16.x
- name: npm install
run: npm ci
- name: eslint
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/images.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const clickOnImageAction = (actionName) => {
cy.getActionEntry('insert-image')
.click()

return cy.get('.popover.open')
return cy.get('.v-popper__wrapper .open')
.getActionEntry(actionName)
.click()
}
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/workspace.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ const menuButton = (name) => {
}

const submenuButton = (name) => {
return cy.get('.popover.open').getActionEntry(name)
return cy.get('.v-popper__wrapper .open').getActionEntry(name)
}

const toggleMoreActions = () => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import axios from '@nextcloud/axios'

// eslint-disable-next-line no-unused-vars,node/no-extraneous-import
// eslint-disable-next-line no-unused-vars,n/no-extraneous-import
import regeneratorRuntime from 'regenerator-runtime'

const url = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')
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-guest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor-rich.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/files-modal.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading