From 8f37876a9dc12ebf80fcf359b133b7e19b97d215 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sun, 7 Aug 2022 19:26:07 +0000 Subject: [PATCH] migration from cypress 9 to cypress 10 --- e2e/cypress.config.js | 39 +++++++++++++++++++ e2e/cypress.json | 30 -------------- e2e/open.bat | 2 +- e2e/package.json | 2 +- e2e/support/{index.js => e2e.js} | 0 ...-test-db.js => 000-generate-test-db.cy.js} | 0 .../1-smoke/{001-home.js => 001-home.cy.js} | 0 .../{002-customer.js => 002-customer.cy.js} | 0 ...service-misc.js => 003-service-misc.cy.js} | 0 ...004-service-wo.js => 004-service-wo.cy.js} | 0 ...rvice-quote.js => 005-service-quote.cy.js} | 0 ...006-service-pm.js => 006-service-pm.cy.js} | 0 .../{007-inventory.js => 007-inventory.cy.js} | 0 .../{008-vendors.js => 008-vendors.cy.js} | 0 ...009-accounting.js => 009-accounting.cy.js} | 0 ...nistration.js => 010-administration.cy.js} | 0 ...rations.js => 011-server-operations.cy.js} | 0 .../1-smoke/{012-misc.js => 012-misc.cy.js} | 0 ...stomer-user.js => 013-customer-user.cy.js} | 0 .../{014-nav-menu.js => 014-nav-menu.cy.js} | 0 .../{000-setup.js => 000-setup.cy.js} | 0 .../{0100-search.js => 0100-search.cy.js} | 0 .../{0200-memo.js => 0200-memo.cy.js} | 0 .../{0300-reminder.js => 0300-reminder.cy.js} | 0 ...bscribe.js => 0400-notify-subscribe.cy.js} | 0 ...0500-contract-create-review-history.cy.js} | 0 ...ervice-rate.js => 0600-service-rate.cy.js} | 0 ...-travel-rate.js => 0700-travel-rate.cy.js} | 0 .../{0800-tax-code.js => 0800-tax-code.cy.js} | 0 ...ved.js => 0900-notification-arrived.cy.js} | 0 ...0100-workorder.js => 0100-workorder.cy.js} | 0 31 files changed, 41 insertions(+), 32 deletions(-) create mode 100644 e2e/cypress.config.js delete mode 100644 e2e/cypress.json rename e2e/support/{index.js => e2e.js} (100%) rename e2e/tests/regression/0-setup/{000-generate-test-db.js => 000-generate-test-db.cy.js} (100%) rename e2e/tests/regression/1-smoke/{001-home.js => 001-home.cy.js} (100%) rename e2e/tests/regression/1-smoke/{002-customer.js => 002-customer.cy.js} (100%) rename e2e/tests/regression/1-smoke/{003-service-misc.js => 003-service-misc.cy.js} (100%) rename e2e/tests/regression/1-smoke/{004-service-wo.js => 004-service-wo.cy.js} (100%) rename e2e/tests/regression/1-smoke/{005-service-quote.js => 005-service-quote.cy.js} (100%) rename e2e/tests/regression/1-smoke/{006-service-pm.js => 006-service-pm.cy.js} (100%) rename e2e/tests/regression/1-smoke/{007-inventory.js => 007-inventory.cy.js} (100%) rename e2e/tests/regression/1-smoke/{008-vendors.js => 008-vendors.cy.js} (100%) rename e2e/tests/regression/1-smoke/{009-accounting.js => 009-accounting.cy.js} (100%) rename e2e/tests/regression/1-smoke/{010-administration.js => 010-administration.cy.js} (100%) rename e2e/tests/regression/1-smoke/{011-server-operations.js => 011-server-operations.cy.js} (100%) rename e2e/tests/regression/1-smoke/{012-misc.js => 012-misc.cy.js} (100%) rename e2e/tests/regression/1-smoke/{013-customer-user.js => 013-customer-user.cy.js} (100%) rename e2e/tests/regression/1-smoke/{014-nav-menu.js => 014-nav-menu.cy.js} (100%) rename e2e/tests/regression/accounting-user/{000-setup.js => 000-setup.cy.js} (100%) rename e2e/tests/regression/accounting-user/{0100-search.js => 0100-search.cy.js} (100%) rename e2e/tests/regression/accounting-user/{0200-memo.js => 0200-memo.cy.js} (100%) rename e2e/tests/regression/accounting-user/{0300-reminder.js => 0300-reminder.cy.js} (100%) rename e2e/tests/regression/accounting-user/{0400-notify-subscribe.js => 0400-notify-subscribe.cy.js} (100%) rename e2e/tests/regression/accounting-user/{0500-contract-create-review-history.js => 0500-contract-create-review-history.cy.js} (100%) rename e2e/tests/regression/accounting-user/{0600-service-rate.js => 0600-service-rate.cy.js} (100%) rename e2e/tests/regression/accounting-user/{0700-travel-rate.js => 0700-travel-rate.cy.js} (100%) rename e2e/tests/regression/accounting-user/{0800-tax-code.js => 0800-tax-code.cy.js} (100%) rename e2e/tests/regression/accounting-user/{0900-notification-arrived.js => 0900-notification-arrived.cy.js} (100%) rename e2e/tests/regression/service-user/{0100-workorder.js => 0100-workorder.cy.js} (100%) diff --git a/e2e/cypress.config.js b/e2e/cypress.config.js new file mode 100644 index 0000000..1b31e8b --- /dev/null +++ b/e2e/cypress.config.js @@ -0,0 +1,39 @@ +const { defineConfig } = require('cypress') + +module.exports = defineConfig({ + defaultCommandTimeout: 5000, + xxxretries: 3, + xbaseUrl: 'http://localhost:7575', + xxxbaseUrl: 'http://localhost:8080', + video: false, + env: { + xapiBaseUrl: 'http://localhost:7575/api/v8.0/', + apiBaseUrl: 'https://test.helloayanova.com/api/v8.0/', + admin: { + login: 'superuser', + password: 'l3tm3in', + }, + accounting: { + login: 'Accounting', + password: 'Accounting', + }, + service: { + login: 'Service', + password: 'Service', + }, + customer: { + login: 'Customer', + password: 'Customer', + }, + }, + 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) + }, + specPattern: 'tests/**/*.cy.{js,jsx,ts,tsx}', + supportFile: 'support/e2e.js', + baseUrl: 'https://test.helloayanova.com', + }, +}) diff --git a/e2e/cypress.json b/e2e/cypress.json deleted file mode 100644 index 47cefca..0000000 --- a/e2e/cypress.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "defaultCommandTimeout": 5000, - "xxxretries": 3, - "integrationFolder": "tests", - "supportFile": "support", - "xbaseUrl": "http://localhost:7575", - "baseUrl": "https://test.helloayanova.com", - "xxxbaseUrl": "http://localhost:8080", - "video": false, - "env": { - "xapiBaseUrl": "http://localhost:7575/api/v8.0/", - "apiBaseUrl": "https://test.helloayanova.com/api/v8.0/", - "admin": { - "login": "superuser", - "password": "l3tm3in" - }, - "accounting": { - "login": "Accounting", - "password": "Accounting" - }, - "service": { - "login": "Service", - "password": "Service" - }, - "customer": { - "login": "Customer", - "password": "Customer" - } - } -} \ No newline at end of file diff --git a/e2e/open.bat b/e2e/open.bat index b8bca54..9a4020a 100644 --- a/e2e/open.bat +++ b/e2e/open.bat @@ -1 +1 @@ -./node_modules/.bin/cypress open +./node_modules/.bin/cypress open --browser chrome --e2e diff --git a/e2e/package.json b/e2e/package.json index e9a5cbf..1f8bd8d 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -7,7 +7,7 @@ "test": "tests" }, "devDependencies": { - "cypress": "^9.7.0" + "cypress": "^10.4.0" }, "scripts": { "open": "./node_modules/.bin/cypress open", diff --git a/e2e/support/index.js b/e2e/support/e2e.js similarity index 100% rename from e2e/support/index.js rename to e2e/support/e2e.js diff --git a/e2e/tests/regression/0-setup/000-generate-test-db.js b/e2e/tests/regression/0-setup/000-generate-test-db.cy.js similarity index 100% rename from e2e/tests/regression/0-setup/000-generate-test-db.js rename to e2e/tests/regression/0-setup/000-generate-test-db.cy.js diff --git a/e2e/tests/regression/1-smoke/001-home.js b/e2e/tests/regression/1-smoke/001-home.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/001-home.js rename to e2e/tests/regression/1-smoke/001-home.cy.js diff --git a/e2e/tests/regression/1-smoke/002-customer.js b/e2e/tests/regression/1-smoke/002-customer.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/002-customer.js rename to e2e/tests/regression/1-smoke/002-customer.cy.js diff --git a/e2e/tests/regression/1-smoke/003-service-misc.js b/e2e/tests/regression/1-smoke/003-service-misc.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/003-service-misc.js rename to e2e/tests/regression/1-smoke/003-service-misc.cy.js diff --git a/e2e/tests/regression/1-smoke/004-service-wo.js b/e2e/tests/regression/1-smoke/004-service-wo.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/004-service-wo.js rename to e2e/tests/regression/1-smoke/004-service-wo.cy.js diff --git a/e2e/tests/regression/1-smoke/005-service-quote.js b/e2e/tests/regression/1-smoke/005-service-quote.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/005-service-quote.js rename to e2e/tests/regression/1-smoke/005-service-quote.cy.js diff --git a/e2e/tests/regression/1-smoke/006-service-pm.js b/e2e/tests/regression/1-smoke/006-service-pm.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/006-service-pm.js rename to e2e/tests/regression/1-smoke/006-service-pm.cy.js diff --git a/e2e/tests/regression/1-smoke/007-inventory.js b/e2e/tests/regression/1-smoke/007-inventory.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/007-inventory.js rename to e2e/tests/regression/1-smoke/007-inventory.cy.js diff --git a/e2e/tests/regression/1-smoke/008-vendors.js b/e2e/tests/regression/1-smoke/008-vendors.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/008-vendors.js rename to e2e/tests/regression/1-smoke/008-vendors.cy.js diff --git a/e2e/tests/regression/1-smoke/009-accounting.js b/e2e/tests/regression/1-smoke/009-accounting.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/009-accounting.js rename to e2e/tests/regression/1-smoke/009-accounting.cy.js diff --git a/e2e/tests/regression/1-smoke/010-administration.js b/e2e/tests/regression/1-smoke/010-administration.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/010-administration.js rename to e2e/tests/regression/1-smoke/010-administration.cy.js diff --git a/e2e/tests/regression/1-smoke/011-server-operations.js b/e2e/tests/regression/1-smoke/011-server-operations.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/011-server-operations.js rename to e2e/tests/regression/1-smoke/011-server-operations.cy.js diff --git a/e2e/tests/regression/1-smoke/012-misc.js b/e2e/tests/regression/1-smoke/012-misc.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/012-misc.js rename to e2e/tests/regression/1-smoke/012-misc.cy.js diff --git a/e2e/tests/regression/1-smoke/013-customer-user.js b/e2e/tests/regression/1-smoke/013-customer-user.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/013-customer-user.js rename to e2e/tests/regression/1-smoke/013-customer-user.cy.js diff --git a/e2e/tests/regression/1-smoke/014-nav-menu.js b/e2e/tests/regression/1-smoke/014-nav-menu.cy.js similarity index 100% rename from e2e/tests/regression/1-smoke/014-nav-menu.js rename to e2e/tests/regression/1-smoke/014-nav-menu.cy.js diff --git a/e2e/tests/regression/accounting-user/000-setup.js b/e2e/tests/regression/accounting-user/000-setup.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/000-setup.js rename to e2e/tests/regression/accounting-user/000-setup.cy.js diff --git a/e2e/tests/regression/accounting-user/0100-search.js b/e2e/tests/regression/accounting-user/0100-search.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/0100-search.js rename to e2e/tests/regression/accounting-user/0100-search.cy.js diff --git a/e2e/tests/regression/accounting-user/0200-memo.js b/e2e/tests/regression/accounting-user/0200-memo.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/0200-memo.js rename to e2e/tests/regression/accounting-user/0200-memo.cy.js diff --git a/e2e/tests/regression/accounting-user/0300-reminder.js b/e2e/tests/regression/accounting-user/0300-reminder.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/0300-reminder.js rename to e2e/tests/regression/accounting-user/0300-reminder.cy.js diff --git a/e2e/tests/regression/accounting-user/0400-notify-subscribe.js b/e2e/tests/regression/accounting-user/0400-notify-subscribe.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/0400-notify-subscribe.js rename to e2e/tests/regression/accounting-user/0400-notify-subscribe.cy.js diff --git a/e2e/tests/regression/accounting-user/0500-contract-create-review-history.js b/e2e/tests/regression/accounting-user/0500-contract-create-review-history.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/0500-contract-create-review-history.js rename to e2e/tests/regression/accounting-user/0500-contract-create-review-history.cy.js diff --git a/e2e/tests/regression/accounting-user/0600-service-rate.js b/e2e/tests/regression/accounting-user/0600-service-rate.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/0600-service-rate.js rename to e2e/tests/regression/accounting-user/0600-service-rate.cy.js diff --git a/e2e/tests/regression/accounting-user/0700-travel-rate.js b/e2e/tests/regression/accounting-user/0700-travel-rate.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/0700-travel-rate.js rename to e2e/tests/regression/accounting-user/0700-travel-rate.cy.js diff --git a/e2e/tests/regression/accounting-user/0800-tax-code.js b/e2e/tests/regression/accounting-user/0800-tax-code.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/0800-tax-code.js rename to e2e/tests/regression/accounting-user/0800-tax-code.cy.js diff --git a/e2e/tests/regression/accounting-user/0900-notification-arrived.js b/e2e/tests/regression/accounting-user/0900-notification-arrived.cy.js similarity index 100% rename from e2e/tests/regression/accounting-user/0900-notification-arrived.js rename to e2e/tests/regression/accounting-user/0900-notification-arrived.cy.js diff --git a/e2e/tests/regression/service-user/0100-workorder.js b/e2e/tests/regression/service-user/0100-workorder.cy.js similarity index 100% rename from e2e/tests/regression/service-user/0100-workorder.js rename to e2e/tests/regression/service-user/0100-workorder.cy.js