update

sreichel · sreichel · commit fa65ee746dd6 · 2025-04-11T08:27:18.000+02:00
diff --git a/cypress/e2e/paths/backend/catalog/categories.cy.js b/cypress/e2e/paths/backend/catalog/categories.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.catalog.categories
+const route = cy.testRoutes.backend.catalog.categories
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/catalog/products.cy.js b/cypress/e2e/paths/backend/catalog/products.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.catalog.products
+const route = cy.testRoutes.backend.catalog.products
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/catalog/search.cy.js b/cypress/e2e/paths/backend/catalog/search.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.catalog.search
+const route = cy.testRoutes.backend.catalog.search
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/catalog/sitemap.cy.js b/cypress/e2e/paths/backend/catalog/sitemap.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.catalog.sitemap
+const route = cy.testRoutes.backend.catalog.sitemap
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/catalog/urlrewrites.cy.js b/cypress/e2e/paths/backend/catalog/urlrewrites.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.catalog.urlrewrite
+const route = cy.testRoutes.backend.catalog.urlrewrite
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/cms/block.cy.js b/cypress/e2e/paths/backend/cms/block.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.cms.block
+const route = cy.testRoutes.backend.cms.block
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/cms/page.cy.js b/cypress/e2e/paths/backend/cms/page.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.cms.page
+const route = cy.testRoutes.backend.cms.page
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/cms/widget.cy.js b/cypress/e2e/paths/backend/cms/widget.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.cms.widget
+const route = cy.testRoutes.backend.cms.widget
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/customer/group.cy.js b/cypress/e2e/paths/backend/customer/group.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.customers.groups
+const route = cy.testRoutes.paths.backend.customers.groups
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/customer/manage.cy.js b/cypress/e2e/paths/backend/customer/manage.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.customers.manage
+const route = cy.testRoutes.paths.backend.customers.manage
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/customer/online.cy.js b/cypress/e2e/paths/backend/customer/online.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.customers.online
+const route = cy.testRoutes.paths.backend.customers.online
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/newsletter/queue.cy.js b/cypress/e2e/paths/backend/newsletter/queue.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.newsletter.queue
+const route = cy.testRoutes.paths.backend.newsletter.queue
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/newsletter/report.cy.js b/cypress/e2e/paths/backend/newsletter/report.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.newsletter.report
+const route = cy.testRoutes.paths.backend.newsletter.report
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/newsletter/subscriber.cy.js b/cypress/e2e/paths/backend/newsletter/subscriber.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.newsletter.subscriber
+const route = cy.testRoutes.paths.backend.newsletter.subscriber
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/newsletter/templates.cy.js b/cypress/e2e/paths/backend/newsletter/templates.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.newsletter.templates
+const route = cy.testRoutes.paths.backend.newsletter.templates
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/promo/cart.cy.js b/cypress/e2e/paths/backend/promo/cart.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.promo.cart
+const route = cy.testRoutes.paths.backend.promo.cart
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/promo/catalog.cy.js b/cypress/e2e/paths/backend/promo/catalog.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.promo.catalog
+const route = cy.testRoutes.paths.backend.promo.catalog
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/sales/creditmemo.cy.js b/cypress/e2e/paths/backend/sales/creditmemo.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.sales.creditmemo
+const route = cy.testRoutes.paths.backend.sales.creditmemo
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/sales/invoice.cy.js b/cypress/e2e/paths/backend/sales/invoice.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.sales.invoice
+const route = cy.testRoutes.paths.backend.sales.invoice
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/sales/order.cy.js b/cypress/e2e/paths/backend/sales/order.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.sales.order
+const route = cy.testRoutes.paths.backend.sales.order
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/sales/shipment.cy.js b/cypress/e2e/paths/backend/sales/shipment.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.sales.shipment
+const route = cy.testRoutes.paths.backend.sales.shipment
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/sales/transactions.cy.js b/cypress/e2e/paths/backend/sales/transactions.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.sales.transactions
+const route = cy.testRoutes.paths.backend.sales.transactions
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/system/cache.cy.js b/cypress/e2e/paths/backend/system/cache.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.system.cache;
+const route = cy.testRoutes.backend.system.cache;
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/system/config/catalog/configswatches.cy.js b/cypress/e2e/paths/backend/system/config/catalog/configswatches.cy.js
@@ -1,7 +1,4 @@
-import { paths } from '../../../../../../support/paths.js';
-import { validation } from '../../../../../../support/validation.js';
-
-const route = paths.backend.system.config.catalog.configswatches;
+const route = cy.testRoutes.paths.backend.system.config.catalog.configswatches;
 const validate = {
     dimension: {
         _input: {
@@ -50,7 +47,7 @@ describe(`Checks admin system "${route.h3}" settings`, () => {
         cy.adminSaveConfiguration();
 
         cy.log('Checking for error messages');
-        const error = validation.errors.digits;
+        const error = validation.digits.error;
         cy.get('#advice-validate-digits-configswatches_product_detail_dimensions_height').should('include.text', error);
         cy.get('#advice-validate-digits-configswatches_product_detail_dimensions_width').should('include.text', error);
         cy.get('#advice-validate-digits-configswatches_product_listing_dimensions_height').should('include.text', error);
@@ -77,7 +74,7 @@ describe(`Checks admin system "${route.h3}" settings`, () => {
         cy.adminSaveConfiguration();
 
         cy.log('Checking for error messages');
-        const error = validation.errors.requiredEntry;
+        const error = validation.requiredEntry.error;
         cy.get('#advice-required-entry-configswatches_product_detail_dimensions_height').should('include.text', error);
         cy.get('#advice-required-entry-configswatches_product_detail_dimensions_width').should('include.text', error);
         cy.get('#advice-required-entry-configswatches_product_listing_dimensions_height').should('include.text', error);
diff --git a/cypress/e2e/paths/backend/system/config/catalog/sitemap.cy.js b/cypress/e2e/paths/backend/system/config/catalog/sitemap.cy.js
@@ -1,82 +1,30 @@
-import { paths } from '../../../../../../support/paths.js';
-import { validation } from '../../../../../../support/validation.js';
-
-const route = paths.backend.system.config.catalog.sitemap;
-const validate = {
-    priority: {
-        _input: {
-            category: '#sitemap_category_priority',
-            product: '#sitemap_product_priority',
-            page: '#sitemap_page_priority',
-        }
-    }
-}
+const route = cy.testRoutes.backend.system.config.catalog.sitemap;
+const assert = cy.openmage.validation.assert;
 
 describe(`Checks admin system "${route.h3}" settings`, () => {
     beforeEach('Log in the user', () => {
-        cy.visit('/admin');
         cy.adminLogInValidUser();
         cy.adminGetConfiguration(route);
     });
 
     it(`tests invalid string priority`, () => {
-        Object.keys(validate.priority._input).forEach(field => {
-            const selector = validate.priority._input[field];
-            const value = validation.assert.string;
-
-            cy
-                .get(selector)
-                .clear({ force: true })
-                .type(value, { force: true })
-                .should('have.value', value);
-        });
-
-        cy.adminSaveConfiguration();
-
-        cy.log('Checking for error messages');
-        const error = validation.errors.number;
-        cy.get('#advice-validate-number-sitemap_category_priority').should('include.text', error);
-        cy.get('#advice-validate-number-sitemap_product_priority').should('include.text', error);
-        cy.get('#advice-validate-number-sitemap_page_priority').should('include.text', error);
+        const validate = cy.openmage.validation.number;
+        cy.openmage.validation.fillFields(route.__validation.priority._input, validate, assert.string);
+        cy.openmage.validation.saveAction(route._buttonSave);
+        cy.openmage.validation.validateFields(route.__validation.priority._input, validate);
     });
 
     it(`tests invalid number priority`, () => {
-        Object.keys(validate.priority._input).forEach(field => {
-            const selector = validate.priority._input[field];
-            const value = validation.assert.numberGreater1;
-
-            cy
-                .get(selector)
-                .clear({ force: true })
-                .type(value, { force: true })
-                .should('have.value', value);
-        });
-
-        cy.adminSaveConfiguration();
-
-        cy.log('Checking for error messages');
-        const error = validation.errors.numberRange;
-        cy.get('#advice-validate-number-range-sitemap_category_priority').should('include.text', error);
-        cy.get('#advice-validate-number-range-sitemap_product_priority').should('include.text', error);
-        cy.get('#advice-validate-number-range-sitemap_page_priority').should('include.text', error);
-    });
+        const validate = cy.openmage.validation.numberRange;
+        cy.openmage.validation.fillFields(route.__validation.priority._input, validate, assert.numberGreater1);
+        cy.openmage.validation.saveAction(route._buttonSave);
+        cy.openmage.validation.validateFields(route.__validation.priority._input, validate);
+     });
 
     it(`tests empty priority`, () => {
-        Object.keys(validate.priority._input).forEach(field => {
-            const selector = validate.priority._input[field];
-
-            cy
-                .get(selector)
-                .clear({ force: true })
-                .should('have.value', '');
-        });
-
-        cy.adminSaveConfiguration();
-
-        cy.log('Checking for error messages');
-        const error = validation.errors.requiredEntry;
-        cy.get('#advice-required-entry-sitemap_category_priority').should('include.text', error);
-        cy.get('#advice-required-entry-sitemap_product_priority').should('include.text', error);
-        cy.get('#advice-required-entry-sitemap_page_priority').should('include.text', error);
+        const validate = cy.openmage.validation.requiredEntry;
+        cy.openmage.validation.fillFields(route.__validation.priority._input, validate);
+        cy.openmage.validation.saveAction(route._buttonSave);
+        cy.openmage.validation.validateFields(route.__validation.priority._input, validate);
     });
 });
diff --git a/cypress/e2e/paths/backend/system/config/customers/promo.cy.js b/cypress/e2e/paths/backend/system/config/customers/promo.cy.js
@@ -1,7 +1,4 @@
-import { paths } from '../../../../../../support/paths.js';
-import { validation } from '../../../../../../support/validation.js';
-
-const route = paths.backend.system.config.customers.promo;
+const route = cy.testRoutes.backend.system.config.customers.promo;
 const validate = {
     _group: {
         couponCodes: {
@@ -16,7 +13,6 @@ const validate = {
 
 describe(`Checks admin system "${route.h3}" settings`, () => {
     beforeEach('Log in the user', () => {
-        cy.visit('/admin');
         cy.adminLogInValidUser();
         cy.adminGetConfiguration(route);
     });
@@ -36,14 +32,17 @@ describe(`Checks admin system "${route.h3}" settings`, () => {
                 .get(selector)
                 .clear({ force: true })
                 .type(value, { force: true })
-                .should('have.value', value);
+                .should('have.value', value)
+                .should('have.class', validation.digits.css);
         });
 
         cy.adminSaveConfiguration();
 
         cy.log('Checking for error messages');
-        const error = validation.errors.digits;
-        cy.get('#advice-validate-digits-promo_auto_generated_coupon_codes_length').should('include.text', error);
-        cy.get('#advice-validate-digits-promo_auto_generated_coupon_codes_dash').should('include.text', error);
+        const error = validation.digits.error;
+        Object.keys(validate._group.couponCodes._input).forEach(field => {
+            const selector = validation.digits._error + validate._group.couponCodes._input[field].replace(/^\#/, "");
+            cy.get(selector).should('include.text', error);
+        });
     });
 });
diff --git a/cypress/e2e/paths/backend/system/design.cy.js b/cypress/e2e/paths/backend/system/design.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.system.design;
+const route = cy.testRoutes.backend.system.design;
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/system/emails.cy.js b/cypress/e2e/paths/backend/system/emails.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.system.email;
+const route = cy.testRoutes.backend.system.email;
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/system/indexes.cy.js b/cypress/e2e/paths/backend/system/indexes.cy.js
@@ -1,7 +1,4 @@
-import {paths} from "../../../../support/paths";
-import {validation} from "../../../../support/validation";
-
-const route = paths.backend.system.indexes;
+const route = cy.testRoutes.backend.system.indexes;
 
 describe(`Checks admin system "${route.h3}"`, () => {
     beforeEach('Log in the user', () => {
diff --git a/cypress/e2e/paths/backend/system/myacount.cy.js b/cypress/e2e/paths/backend/system/myacount.cy.js
diff --git a/cypress/e2e/paths/backend/system/notifications.cy.js b/cypress/e2e/paths/backend/system/notifications.cy.js
diff --git a/cypress/e2e/paths/backend/system/stores.cy.js b/cypress/e2e/paths/backend/system/stores.cy.js
diff --git a/cypress/e2e/paths/backend/system/variable.cy.js b/cypress/e2e/paths/backend/system/variable.cy.js
diff --git a/cypress/e2e/paths/frontend/newsletter-subscribe.cy.js b/cypress/e2e/paths/frontend/newsletter-subscribe.cy.js
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
diff --git a/cypress/support/functions.js b/cypress/support/functions.js
diff --git a/cypress/support/openmage.js b/cypress/support/openmage.js
diff --git a/cypress/support/openmage/config/paths.js b/cypress/support/openmage/config/paths.js
diff --git a/cypress/support/validation.js b/cypress/support/validation.js
