Merge pull request #1083 from paperless-ngx/dependabot/npm_and_yarn/src-ui/dev/cypress-10.0.1

Bump cypress from 9.6.1 to 10.0.1 in /src-ui

src-ui/cypress.config.ts

@@ -0,0 +1,13 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  videosFolder: 'cypress/videos',
+  screenshotsFolder: 'cypress/screenshots',
+  fixturesFolder: 'cypress/fixtures',
+  e2e: {
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.ts')(on, config)
+    },
+    baseUrl: 'http://localhost:4200',
+  },
+})

src-ui/cypress.json

@@ -1,9 +0,0 @@
-{
-  "integrationFolder": "cypress/integration",
-  "supportFile": "cypress/support/index.ts",
-  "videosFolder": "cypress/videos",
-  "screenshotsFolder": "cypress/screenshots",
-  "pluginsFile": "cypress/plugins/index.ts",
-  "fixturesFolder": "cypress/fixtures",
-  "baseUrl": "http://localhost:4200"
-}

src-ui/cypress/e2e/documents/document-detail.cy.ts

@@ -1,10 +1,9 @@
 describe('document-detail', () => {
   beforeEach(() => {
+    // also uses global fixtures from cypress/support/e2e.ts
+
     this.modifiedDocuments = []
 
-    cy.intercept('http://localhost:8000/api/ui_settings/', {
-      fixture: 'ui_settings/settings.json',
-    })
     cy.fixture('documents/documents.json').then((documentsJson) => {
       cy.intercept('GET', 'http://localhost:8000/api/documents/1/', (req) => {
         let response = { ...documentsJson }
@@ -18,30 +17,6 @@ describe('document-detail', () => {
       req.reply({ result: 'OK' })
     }).as('saveDoc')
 
-    cy.intercept('http://localhost:8000/api/documents/1/metadata/', {
-      fixture: 'documents/1/metadata.json',
-    })
-
-    cy.intercept('http://localhost:8000/api/documents/1/suggestions/', {
-      fixture: 'documents/1/suggestions.json',
-    })
-
-    cy.intercept('http://localhost:8000/api/saved_views/*', {
-      fixture: 'saved_views/savedviews.json',
-    })
-
-    cy.intercept('http://localhost:8000/api/tags/*', {
-      fixture: 'tags/tags.json',
-    })
-
-    cy.intercept('http://localhost:8000/api/correspondents/*', {
-      fixture: 'correspondents/correspondents.json',
-    })
-
-    cy.intercept('http://localhost:8000/api/document_types/*', {
-      fixture: 'document_types/doctypes.json',
-    })
-
     cy.viewport(1024, 1024)
     cy.visit('/documents/1/')
   })

src-ui/cypress/e2e/documents/documents-list.cy.ts

@@ -1,11 +1,9 @@
 describe('documents-list', () => {
   beforeEach(() => {
+    // also uses global fixtures from cypress/support/e2e.ts
+
     this.bulkEdits = {}
 
-    // mock API methods
-    cy.intercept('http://localhost:8000/api/ui_settings/', {
-      fixture: 'ui_settings/settings.json',
-    })
     cy.fixture('documents/documents.json').then((documentsJson) => {
       // bulk edit
       cy.intercept(
@@ -56,22 +54,6 @@ describe('documents-list', () => {
       })
     })
 
-    cy.intercept('http://localhost:8000/api/documents/1/thumb/', {
-      fixture: 'documents/lorem-ipsum.png',
-    })
-
-    cy.intercept('http://localhost:8000/api/tags/*', {
-      fixture: 'tags/tags.json',
-    })
-
-    cy.intercept('http://localhost:8000/api/correspondents/*', {
-      fixture: 'correspondents/correspondents.json',
-    })
-
-    cy.intercept('http://localhost:8000/api/document_types/*', {
-      fixture: 'document_types/doctypes.json',
-    })
-
     cy.viewport(1280, 1024)
     cy.visit('/documents')
   })

src-ui/cypress/e2e/documents/query-params.cy.ts

@@ -2,27 +2,8 @@ import { PaperlessDocument } from 'src/app/data/paperless-document'
 
 describe('documents query params', () => {
   beforeEach(() => {
-    cy.intercept('http://localhost:8000/api/ui_settings/', {
+    // also uses global fixtures from cypress/support/e2e.ts
-      fixture: 'ui_settings/settings.json',
+
-    })
-    cy.intercept('http://localhost:8000/api/remote_version/', {
-      fixture: 'remote_version/remote_version.json',
-    })
-    cy.intercept('http://localhost:8000/api/correspondents/*', {
-      fixture: 'correspondents/correspondents.json',
-    })
-    cy.intercept('http://localhost:8000/api/document_types/*', {
-      fixture: 'document_types/doctypes.json',
-    })
-    cy.intercept('http://localhost:8000/api/saved_views/*', {
-      fixture: 'saved_views/savedviews.json',
-    })
-    cy.intercept('http://localhost:8000/api/storage_paths/*', {
-      fixture: 'storage_paths/storage_paths.json',
-    })
-    cy.intercept('http://localhost:8000/api/tags/*', {
-      fixture: 'tags/tags.json',
-    })
     cy.fixture('documents/documents.json').then((documentsJson) => {
       // mock api filtering
       cy.intercept('GET', 'http://localhost:8000/api/documents/*', (req) => {

src-ui/cypress/e2e/manage/manage.cy.ts

@@ -1,15 +1,5 @@
 describe('manage', () => {
-  beforeEach(() => {
+  // also uses global fixtures from cypress/support/e2e.ts
-    cy.intercept('http://localhost:8000/api/ui_settings/', {
-      fixture: 'ui_settings/settings.json',
-    })
-    cy.intercept('http://localhost:8000/api/correspondents/*', {
-      fixture: 'correspondents/correspondents.json',
-    })
-    cy.intercept('http://localhost:8000/api/tags/*', {
-      fixture: 'tags/tags.json',
-    })
-  })
 
   it('should show a list of correspondents with bottom pagination as well', () => {
     cy.visit('/correspondents')

src-ui/cypress/e2e/settings/settings.cy.ts

@@ -1,5 +1,7 @@
 describe('settings', () => {
   beforeEach(() => {
+    // also uses global fixtures from cypress/support/e2e.ts
+
     this.modifiedViews = []
 
     // mock API methods
@@ -42,14 +44,6 @@ describe('settings', () => {
           req.reply(response)
         })
       })
-
-      cy.intercept('http://localhost:8000/api/documents/1/metadata/', {
-        fixture: 'documents/1/metadata.json',
-      })
-
-      cy.intercept('http://localhost:8000/api/documents/1/suggestions/', {
-        fixture: 'documents/1/suggestions.json',
-      })
     })
 
     cy.viewport(1024, 1024)

src-ui/cypress/support/e2e.ts

@@ -0,0 +1,43 @@
+// mock API methods
+
+beforeEach(() => {
+  cy.intercept('http://localhost:8000/api/ui_settings/', {
+    fixture: 'ui_settings/settings.json',
+  })
+
+  cy.intercept('http://localhost:8000/api/remote_version/', {
+    fixture: 'remote_version/remote_version.json',
+  })
+
+  cy.intercept('http://localhost:8000/api/saved_views/*', {
+    fixture: 'saved_views/savedviews.json',
+  })
+
+  cy.intercept('http://localhost:8000/api/tags/*', {
+    fixture: 'tags/tags.json',
+  })
+
+  cy.intercept('http://localhost:8000/api/correspondents/*', {
+    fixture: 'correspondents/correspondents.json',
+  })
+
+  cy.intercept('http://localhost:8000/api/document_types/*', {
+    fixture: 'document_types/doctypes.json',
+  })
+
+  cy.intercept('http://localhost:8000/api/storage_paths/*', {
+    fixture: 'storage_paths/storage_paths.json',
+  })
+
+  cy.intercept('http://localhost:8000/api/documents/1/metadata/', {
+    fixture: 'documents/1/metadata.json',
+  })
+
+  cy.intercept('http://localhost:8000/api/documents/1/suggestions/', {
+    fixture: 'documents/1/suggestions.json',
+  })
+
+  cy.intercept('http://localhost:8000/api/documents/1/thumb/', {
+    fixture: 'documents/lorem-ipsum.png',
+  })
+})

src-ui/cypress/support/index.ts

@@ -1,17 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// When a command from ./commands is ready to use, import with `import './commands'` syntax
-// import './commands';

src-ui/package-lock.json

@@ -16,12 +16,12 @@
         "@angular/platform-browser": "~13.3.11",
         "@angular/platform-browser-dynamic": "~13.3.11",
         "@angular/router": "~13.3.11",
-        "@cypress/schematic": "^2.0.0",
         "@ng-bootstrap/ng-bootstrap": "^12.1.2",
         "@ng-select/ng-select": "^8.1.1",
         "@ngneat/dirty-check-forms": "^3.0.2",
         "@popperjs/core": "^2.11.5",
         "bootstrap": "^5.1.3",
+        "cypress": "~10.0.1",
         "file-saver": "^2.0.5",
         "ng2-pdf-viewer": "^9.0.0",
         "ngx-color": "^7.3.3",
@@ -51,7 +51,7 @@
       },
       "optionalDependencies": {
         "@cypress/schematic": "^2.0.0",
-        "cypress": "~9.6.0"
+        "cypress": "~10.0.1"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -8101,9 +8101,9 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "9.6.1",
+      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.0.1.tgz",
-      "integrity": "sha512-ECzmV7pJSkk+NuAhEw6C3D+RIRATkSb2VAHXDY6qGZbca/F9mv5pPsj2LO6Ty6oIFVBTrwCyL9agl28MtJMe2g==",
+      "integrity": "sha512-04vefCc6LrrgBS7Qhqn+9lqXTneLYZZwOokBaCJToI9DHu7/ywhywYNUg/Qy4xWOxlKvbvnELGCa7HZbSgeLfQ==",
       "hasInstallScript": true,
       "optional": true,
       "dependencies": {
@@ -25674,9 +25674,9 @@
       }
     },
     "cypress": {
-      "version": "9.6.1",
+      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.0.1.tgz",
-      "integrity": "sha512-ECzmV7pJSkk+NuAhEw6C3D+RIRATkSb2VAHXDY6qGZbca/F9mv5pPsj2LO6Ty6oIFVBTrwCyL9agl28MtJMe2g==",
+      "integrity": "sha512-04vefCc6LrrgBS7Qhqn+9lqXTneLYZZwOokBaCJToI9DHu7/ywhywYNUg/Qy4xWOxlKvbvnELGCa7HZbSgeLfQ==",
       "optional": true,
       "requires": {
         "@cypress/request": "^2.88.10",

src-ui/package.json

@@ -55,6 +55,6 @@
   },
   "optionalDependencies": {
     "@cypress/schematic": "^2.0.0",
-    "cypress": "~9.6.0"
+    "cypress": "~10.0.1"
   }
 }