From d2e8a9368cbe74bcb2d4100e0ceea09b492186be Mon Sep 17 00:00:00 2001 From: Kailash Nadh Date: Tue, 18 Oct 2022 21:58:57 +0530 Subject: [PATCH] Upgrade Cypress to major version 10. --- frontend/cypress.config.js | 21 ++++++++++++++++ frontend/cypress.json | 11 -------- .../bounces.js => e2e/bounces.cy.js} | 0 .../campaigns.js => e2e/campaigns.cy.js} | 0 .../dashboard.js => e2e/dashboard.cy.js} | 0 .../{integration/forms.js => e2e/forms.cy.js} | 0 .../import.js => e2e/import.cy.js} | 0 .../{integration/lists.js => e2e/lists.cy.js} | 0 .../settings.js => e2e/settings.cy.js} | 0 .../subscribers.js => e2e/subscribers.cy.js} | 0 .../templates.js => e2e/templates.cy.js} | 0 frontend/cypress/support/{index.js => e2e.js} | 0 frontend/package.json | 2 +- frontend/yarn.lock | 25 +++++++++++-------- 14 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 frontend/cypress.config.js delete mode 100644 frontend/cypress.json rename frontend/cypress/{integration/bounces.js => e2e/bounces.cy.js} (100%) rename frontend/cypress/{integration/campaigns.js => e2e/campaigns.cy.js} (100%) rename frontend/cypress/{integration/dashboard.js => e2e/dashboard.cy.js} (100%) rename frontend/cypress/{integration/forms.js => e2e/forms.cy.js} (100%) rename frontend/cypress/{integration/import.js => e2e/import.cy.js} (100%) rename frontend/cypress/{integration/lists.js => e2e/lists.cy.js} (100%) rename frontend/cypress/{integration/settings.js => e2e/settings.cy.js} (100%) rename frontend/cypress/{integration/subscribers.js => e2e/subscribers.cy.js} (100%) rename frontend/cypress/{integration/templates.js => e2e/templates.cy.js} (100%) rename frontend/cypress/support/{index.js => e2e.js} (100%) diff --git a/frontend/cypress.config.js b/frontend/cypress.config.js new file mode 100644 index 0000000..b3d1ae0 --- /dev/null +++ b/frontend/cypress.config.js @@ -0,0 +1,21 @@ +const { defineConfig } = require('cypress') + +module.exports = defineConfig({ + env: { + apiUrl: 'http://localhost:9000', + serverInitCmd: + 'pkill -9 listmonk | cd ../ && ./listmonk --install --yes && ./listmonk > /dev/null 2>/dev/null &', + username: 'listmonk', + password: 'listmonk', + }, + viewportWidth: 1300, + viewportHeight: 950, + e2e: { + // We've imported your old cypress plugins here. + // You may want to clean this up later by importing these. + setupNodeEvents(on, config) { + return require('./cypress/plugins/index.js')(on, config) + }, + baseUrl: 'http://localhost:9000/admin', + }, +}) diff --git a/frontend/cypress.json b/frontend/cypress.json deleted file mode 100644 index f270176..0000000 --- a/frontend/cypress.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "baseUrl": "http://localhost:9000/admin", - "env": { - "apiUrl": "http://localhost:9000", - "serverInitCmd": "pkill -9 listmonk | cd ../ && ./listmonk --install --yes && ./listmonk > /dev/null 2>/dev/null &", - "username": "listmonk", - "password": "listmonk" - }, - "viewportWidth": 1300, - "viewportHeight": 950 -} diff --git a/frontend/cypress/integration/bounces.js b/frontend/cypress/e2e/bounces.cy.js similarity index 100% rename from frontend/cypress/integration/bounces.js rename to frontend/cypress/e2e/bounces.cy.js diff --git a/frontend/cypress/integration/campaigns.js b/frontend/cypress/e2e/campaigns.cy.js similarity index 100% rename from frontend/cypress/integration/campaigns.js rename to frontend/cypress/e2e/campaigns.cy.js diff --git a/frontend/cypress/integration/dashboard.js b/frontend/cypress/e2e/dashboard.cy.js similarity index 100% rename from frontend/cypress/integration/dashboard.js rename to frontend/cypress/e2e/dashboard.cy.js diff --git a/frontend/cypress/integration/forms.js b/frontend/cypress/e2e/forms.cy.js similarity index 100% rename from frontend/cypress/integration/forms.js rename to frontend/cypress/e2e/forms.cy.js diff --git a/frontend/cypress/integration/import.js b/frontend/cypress/e2e/import.cy.js similarity index 100% rename from frontend/cypress/integration/import.js rename to frontend/cypress/e2e/import.cy.js diff --git a/frontend/cypress/integration/lists.js b/frontend/cypress/e2e/lists.cy.js similarity index 100% rename from frontend/cypress/integration/lists.js rename to frontend/cypress/e2e/lists.cy.js diff --git a/frontend/cypress/integration/settings.js b/frontend/cypress/e2e/settings.cy.js similarity index 100% rename from frontend/cypress/integration/settings.js rename to frontend/cypress/e2e/settings.cy.js diff --git a/frontend/cypress/integration/subscribers.js b/frontend/cypress/e2e/subscribers.cy.js similarity index 100% rename from frontend/cypress/integration/subscribers.js rename to frontend/cypress/e2e/subscribers.cy.js diff --git a/frontend/cypress/integration/templates.js b/frontend/cypress/e2e/templates.cy.js similarity index 100% rename from frontend/cypress/integration/templates.js rename to frontend/cypress/e2e/templates.cy.js diff --git a/frontend/cypress/support/index.js b/frontend/cypress/support/e2e.js similarity index 100% rename from frontend/cypress/support/index.js rename to frontend/cypress/support/e2e.js diff --git a/frontend/package.json b/frontend/package.json index 45beab1..da025c8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -34,7 +34,7 @@ "@vue/cli-service": "~4.5.13", "@vue/eslint-config-airbnb": "^5.3.0", "babel-eslint": "^10.1.0", - "cypress": "9.5.2", + "cypress": "10.10.0", "cypress-file-upload": "^5.0.2", "eslint": "^7.27.0", "eslint-plugin-import": "^2.23.3", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 0ec0a4f..ab38764 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -3552,10 +3552,10 @@ cypress-file-upload@^5.0.2: dependencies: mime "^2.5.0" -cypress@9.5.2: - version "9.5.2" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.5.2.tgz#8fb6ee4a890fbc35620800810bf6fb11995927bd" - integrity sha512-gYiQYvJozMzDOriUV1rCt6CeRM/pRK4nhwGJj3nJQyX2BoUdTCVwp30xDMKc771HiNVhBtgj5o5/iBdVDVXQUg== +cypress@10.10.0: + version "10.10.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.10.0.tgz#fd671297b2ca3e64dfffd55fe3857c388cfbb695" + integrity sha512-bU8r44x1NIYAUNNXt3CwJpLOVth7HUv2hUhYCxZmgZ1IugowDvuHNpevnoZRQx1KKOEisLvIJW+Xen5Pjn41pg== dependencies: "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4" @@ -3576,7 +3576,7 @@ cypress@9.5.2: dayjs "^1.10.4" debug "^4.3.2" enquirer "^2.3.6" - eventemitter2 "^6.4.3" + eventemitter2 "6.4.7" execa "4.1.0" executable "^4.1.1" extract-zip "2.0.1" @@ -3589,7 +3589,7 @@ cypress@9.5.2: listr2 "^3.8.3" lodash "^4.17.21" log-symbols "^4.0.0" - minimist "^1.2.5" + minimist "^1.2.6" ospath "^1.2.2" pretty-bytes "^5.6.0" proxy-from-env "1.0.0" @@ -4610,10 +4610,10 @@ event-pubsub@4.3.0: resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e" integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ== -eventemitter2@^6.4.3: - version "6.4.4" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.4.tgz#aa96e8275c4dbeb017a5d0e03780c65612a1202b" - integrity sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw== +eventemitter2@6.4.7: + version "6.4.7" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d" + integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg== eventemitter3@^4.0.0: version "4.0.4" @@ -6856,6 +6856,11 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minimist@^1.2.6: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + minipass@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"