Skip to content

Commit

Permalink
Merge pull request #1868 from nextcloud/dependabot/npm_and_yarn/nextc…
Browse files Browse the repository at this point in the history
…loud/initial-state-2.1.0
  • Loading branch information
skjnldsv authored Aug 15, 2023
2 parents 24f4f5d + 8a7cb50 commit 164305c
Show file tree
Hide file tree
Showing 14 changed files with 63 additions and 98 deletions.
12 changes: 6 additions & 6 deletions cypress/e2e/actions/sidebar.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already
// we hide the sidebar button if opened
cy.get('.action-button__icon.icon-menu-sidebar').should('not.exist')
// check the sidebar is opened for the correct file
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image1.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__mainname').should('contain', 'image1.jpg')
// check we do not have a preview
cy.get('aside.app-sidebar .app-sidebar-header').should('have.class', 'app-sidebar-header--with-figure')
cy.get('aside.app-sidebar .app-sidebar-header').should('have.class', 'app-sidebar-header--compact')
Expand All @@ -87,7 +87,7 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already

it('Sidebar is in compact mode', function() {
// check the sidebar is opened for the correct file
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image1.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__mainname').should('contain', 'image1.jpg')
// check we do not have a preview
cy.get('aside.app-sidebar .app-sidebar-header').should('have.class', 'app-sidebar-header--with-figure')
cy.get('aside.app-sidebar .app-sidebar-header').should('have.class', 'app-sidebar-header--compact')
Expand All @@ -98,22 +98,22 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already
cy.get('aside.app-sidebar').should('be.visible')

// check the sidebar is opened for the correct file
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image1.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__mainname').should('contain', 'image1.jpg')

// open the next file (image2.png) using the arrow
cy.get('body > .viewer .button-vue.next').click()
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image2.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__mainname').should('contain', 'image2.jpg')
})

it('Change to previous image with sidebar open', function() {
cy.get('aside.app-sidebar').should('be.visible')

// check the sidebar is opened for the correct file
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image2.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__mainname').should('contain', 'image2.jpg')

// open the previous file (image1.png) using the arrow
cy.get('body > .viewer .button-vue.prev').click()
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image1.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__mainname').should('contain', 'image1.jpg')
})

it('Close the sidebar', function() {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/mixins/oddname.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export default function(file, type, sidebar = false) {
// we hide the sidebar button if opened
cy.get('.action-button__icon.icon-menu-sidebar').should('not.exist')
// check the sidebar is opened for the correct file
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', placedName)
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__mainname').should('contain', placedName)
// check we do not have a preview
cy.get('aside.app-sidebar .app-sidebar-header').should('have.class', 'app-sidebar-header--with-figure')
cy.get('aside.app-sidebar .app-sidebar-header').should('have.class', 'app-sidebar-header--compact')
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/sharing/single-file-share.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('See shared folder with link share', function() {
cy.get('#imgframe > #viewer').should('be.visible')

cy.scrollTo('bottom', { ensureScrollable: false })
cy.get('a#downloadFile').should('be.visible')
cy.get(`#header a[href*="/s/${imageToken}/download"]`).should('be.visible')
})

it('Opens the shared video in the viewer', function() {
Expand All @@ -61,6 +61,6 @@ describe('See shared folder with link share', function() {
cy.get('#imgframe > #viewer').should('be.visible')

cy.scrollTo('bottom', { ensureScrollable: false })
cy.get('a#downloadFile').should('be.visible')
cy.get(`#header a[href*="/s/${videoToken}/download"]`).should('be.visible')
})
})
Binary file modified cypress/snapshots/base/visual-regression.cy.js/image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cypress/snapshots/base/visual-regression.cy.js/image2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cypress/snapshots/base/visual-regression.cy.js/non-dav.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cypress/snapshots/base/visual-regression.cy.js/video.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions js/viewer-components.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

64 changes: 20 additions & 44 deletions js/viewer-main.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
/*!
* Determine if an object is a Buffer
*
* @author Feross Aboukhadijeh <https://feross.org>
* @license MIT
*/

/*!
* The buffer module from node.js, for the browser.
*
* @author Feross Aboukhadijeh <https://feross.org>
* @license MIT
*/

/*!
* Toastify js 1.12.0
* https://github.com/apvarun/toastify-js
Expand Down Expand Up @@ -26,6 +40,12 @@

/*! For license information please see isFullscreen.js.LICENSE.txt */

/*! https://mths.be/punycode v1.4.1 by @mathias */

/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */

/**
* @copyright Copyright (c) 2019 John Molakvoæ <[email protected]>
*
Expand Down Expand Up @@ -70,28 +90,6 @@
*
*/

/**
* @copyright Copyright (c) 2021 John Molakvoæ <[email protected]>
*
* @author John Molakvoæ <[email protected]>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

/**
* @copyright Copyright (c) 2021 John Molakvoæ <[email protected]>
*
Expand All @@ -113,25 +111,3 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

/**
* @copyright Copyright (c) 2022 John Molakvoæ <[email protected]>
*
* @author John Molakvoæ <[email protected]>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
2 changes: 1 addition & 1 deletion js/viewer-main.js.map

Large diffs are not rendered by default.

55 changes: 22 additions & 33 deletions package-lock.json

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

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
"dependencies": {
"@fontsource/roboto": "^5.0.8",
"@nextcloud/auth": "^2.1.0",
"@nextcloud/axios": "^2.4.0",
"@nextcloud/axios": "^2.1.0",
"@nextcloud/dialogs": "^4.1.0",
"@nextcloud/event-bus": "^3.1.0",
"@nextcloud/files": "^3.0.0-beta.14",
"@nextcloud/initial-state": "^2.0.0",
"@nextcloud/l10n": "^2.1.0",
"@nextcloud/initial-state": "^2.1.0",
"@nextcloud/l10n": "^2.2.0",
"@nextcloud/logger": "^2.5.0",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.1.2",
Expand All @@ -57,7 +57,7 @@
"@skjnldsv/vue-plyr": "^7.3.1",
"camelcase": "^8.0.0",
"debounce": "^1.2.1",
"filerobot-image-editor": "^4.5.0",
"filerobot-image-editor": "^4.5.1",
"nextcloud-server": "^0.15.10",
"path-parse": "^1.0.7",
"vue": "^2.7.14",
Expand All @@ -78,13 +78,13 @@
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/cypress": "^1.0.0-beta.2",
"@nextcloud/eslint-config": "^8.3.0-beta.0",
"@nextcloud/eslint-config": "^8.3.0-beta.2",
"@nextcloud/stylelint-config": "^2.3.1",
"@nextcloud/webpack-vue-config": "^5.5.1",
"@types/dockerode": "^3.3.19",
"@vue/tsconfig": "^0.4.0",
"babel-loader-exclude-node-modules-except": "^1.2.1",
"cypress": "^12.16.0",
"cypress": "^12.17.3",
"cypress-visual-regression": "^3.0.0",
"dockerode": "^3.3.5",
"eslint-plugin-cypress": "^2.14.0",
Expand Down

0 comments on commit 164305c

Please sign in to comment.