Merge pull request #1239 from nextcloud/backport/1230/stable24

nextcloud · May 3, 2022 · 6ae2dab · 6ae2dab
2 parents cc30198 + 3a4b708
commit 6ae2dab
Show file tree

Hide file tree

Showing 64 changed files with 436 additions and 365 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -90,7 +90,15 @@ jobs:
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           # https://github.com/cypress-io/github-action/issues/124
-          COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
+          COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }} 
+          TESTING: true
+
+      - name: Upload snapshots
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: snapshots
+          path: cypress/snapshots
 
   summary:
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -17,9 +17,14 @@ yarn-error.log*
 build/
 coverage/
 
+vendor
+.php_cs.cache
+
+# Cypress files
+js/*roboto*
 cypress/downloads
 cypress/screenshots
 cypress/snapshots
 cypress/videos
-vendor
-.php_cs.cache
+cypress/snapshots/actual
+cypress/snapshots/diff
diff --git a/cypress.json b/cypress.json
@@ -5,5 +5,11 @@
   "viewportHeight": 720,
   "defaultCommandTimeout": 6000,
   "retries": 2,
-  "testFiles": "**/*.spec.js"
+  "testFiles": "**/*.spec.js",
+  "env": {
+    "failSilently": false,
+    "type": "actual"
+  },
+  "screenshotsFolder": "cypress/snapshots/actual",
+  "trashAssetsBeforeRuns": true
 }
diff --git a/cypress/fixtures/test-card.mp4 b/cypress/fixtures/test-card.mp4
diff --git a/cypress/fixtures/test-card.png b/cypress/fixtures/test-card.png
diff --git a/cypress/initserver.sh b/cypress/initserver.sh
@@ -7,6 +7,7 @@ chown -R www-data:www-data /var/www/html/data
 
 su www-data -c "
 	php occ config:system:set force_language --value en
+	php occ config:system:set enforce_theme --value light
 	php occ app:enable $APP_NAME
 	php occ app:list
 "
diff --git a/cypress/integration/audio.mpeg.spec.js b/cypress/integration/audio.mpeg.spec.js
@@ -3,7 +3,7 @@
  *
  * @author Daniel Kesselberg <mail@danielkesselberg.de>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/audio.ogg.spec.js b/cypress/integration/audio.ogg.spec.js
@@ -3,7 +3,7 @@
  *
  * @author Daniel Kesselberg <mail@danielkesselberg.de>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/audios.spec.js b/cypress/integration/audios.spec.js
@@ -3,7 +3,7 @@
  *
  * @author Daniel Kesselberg <mail@danielkesselberg.de>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/delete.spec.js b/cypress/integration/delete.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/download-share-disabled.spec.js b/cypress/integration/download-share-disabled.spec.js
@@ -3,7 +3,7 @@
  *
  * @author Florent Fayolle <florent@zeteo.me>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/download-share.spec.js b/cypress/integration/download-share.spec.js
@@ -3,7 +3,7 @@
  *
  * @author Florent Fayolle <florent@zeteo.me>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/download.spec.js b/cypress/integration/download.spec.js
@@ -3,7 +3,7 @@
  *
  * @author Florent Fayolle <florent@zeteo.me>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/files-shares.spec.js b/cypress/integration/files-shares.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/files.spec.js b/cypress/integration/files.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/image-small.png.spec.js b/cypress/integration/image-small.png.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/image.gif.spec.js b/cypress/integration/image.gif.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/image.png.spec.js b/cypress/integration/image.png.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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
@@ -57,10 +57,6 @@ describe('Open image.png in viewer', function() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Is not in mobile fullscreen mode', function() {
-		cy.get('body > .viewer .modal-wrapper').should('not.have.class', 'modal-wrapper--full')
-	})
-
 	it('See the menu icon and title on the viewer header', function() {
 		cy.get('body > .viewer .modal-title').should('contain', 'image.png')
 		cy.get('body > .viewer .modal-header button.action-item__menutoggle').should('be.visible')

diff --git a/cypress/integration/image.svg.spec.js b/cypress/integration/image.svg.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/image.webp.spec.js b/cypress/integration/image.webp.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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
@@ -57,10 +57,6 @@ describe('Open image.webp in viewer', function() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Is not in mobile fullscreen mode', function() {
-		cy.get('body > .viewer .modal-wrapper').should('not.have.class', 'modal-wrapper--full')
-	})
-
 	it('See the menu icon and title on the viewer header', function() {
 		cy.get('body > .viewer .modal-title').should('contain', 'image.webp')
 		cy.get('body > .viewer .modal-header button.action-item__menutoggle').should('be.visible')

diff --git a/cypress/integration/images-custom-list-loadmore.spec.js b/cypress/integration/images-custom-list-loadmore.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/images-custom-list.spec.js b/cypress/integration/images-custom-list.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/images.spec.js b/cypress/integration/images.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/oddname/oddname.js b/cypress/integration/oddname/oddname.js
@@ -4,7 +4,7 @@
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  * @author Robbert Gurdeep Singh <git@beardhatcode.be>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/sidebar.spec.js b/cypress/integration/sidebar.spec.js
@@ -4,7 +4,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/video.mkv.spec.js b/cypress/integration/video.mkv.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/video.mp4.spec.js b/cypress/integration/video.mp4.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/video.ogv.spec.js b/cypress/integration/video.ogv.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/video.webm.spec.js b/cypress/integration/video.webm.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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

diff --git a/cypress/integration/videos.spec.js b/cypress/integration/videos.spec.js
@@ -3,7 +3,7 @@
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @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