diff --git a/cypress/e2e/mp/marketplace-agent-assist/agent-merchant-portal.cy.ts b/cypress/e2e/mp/marketplace-agent-assist/agent-merchant-portal.cy.ts index 582f9e43..49c6d241 100644 --- a/cypress/e2e/mp/marketplace-agent-assist/agent-merchant-portal.cy.ts +++ b/cypress/e2e/mp/marketplace-agent-assist/agent-merchant-portal.cy.ts @@ -85,8 +85,16 @@ import { CheckoutMpScenario, CustomerLoginScenario } from '@scenarios/yves'; }); productsPage.visit(); - productsPage.find({ query: dynamicFixtures.productConcreteForMerchant.abstract_sku }).click({ force: true }); - productsPage.getDrawer().find(productsPage.getSaveButtonSelector()).click(); + productsPage.find({ query: dynamicFixtures.productConcreteForMerchant.abstract_sku }).click(); + + productsPage.getDrawer().as('drawer'); + + cy.get('@drawer') + .find(productsPage.getTaxIdSetOptionSelector()) + .eq(1) + .then((el) => cy.get(productsPage.getTaxIdSetSelector()).select(el.val() ?? '', { force: true })); + + cy.get('@drawer').find(productsPage.getSaveButtonSelector()).click(); cy.get('body').contains('The Product is saved.'); }); diff --git a/cypress/e2e/yves/order-amendment/order-amendment-finish.cy.ts b/cypress/e2e/yves/order-amendment/order-amendment-finish.cy.ts index 4d4cd169..bbb9a891 100644 --- a/cypress/e2e/yves/order-amendment/order-amendment-finish.cy.ts +++ b/cypress/e2e/yves/order-amendment/order-amendment-finish.cy.ts @@ -40,8 +40,8 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; assertOrderCancellationForPrevOrder(); customerOverviewPage.viewLastPlacedOrder(); - customerOverviewPage.assertProductQuantity(dynamicFixtures.product1.name, 1); - customerOverviewPage.assertProductQuantity(dynamicFixtures.product2.name, 1); + customerOverviewPage.assertProductQuantity(dynamicFixtures.product1.localized_attributes[0].name, 1); + customerOverviewPage.assertProductQuantity(dynamicFixtures.product2.localized_attributes[0].name, 1); }); it('customer should be able to finish amended order with updated product quantity', (): void => { @@ -57,7 +57,7 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; assertOrderCancellationForPrevOrder(); customerOverviewPage.viewLastPlacedOrder(); - customerOverviewPage.assertProductQuantity(dynamicFixtures.product1.name, 3); + customerOverviewPage.assertProductQuantity(dynamicFixtures.product1.localized_attributes[0].name, 3); }); function assertOrderCancellationForPrevOrder(): void { diff --git a/cypress/e2e/yves/order-amendment/order-amendment-start.cy.ts b/cypress/e2e/yves/order-amendment/order-amendment-start.cy.ts index 2dab55d7..5af37f35 100644 --- a/cypress/e2e/yves/order-amendment/order-amendment-start.cy.ts +++ b/cypress/e2e/yves/order-amendment/order-amendment-start.cy.ts @@ -45,7 +45,7 @@ import { DeactivateProductScenario } from '../../../support/scenarios/backoffice cartPage.assertPageLocation(); cartPage.assertCartName(`Editing Order ${orderReference}`); - cy.get('body').contains(dynamicFixtures.product.name).should('exist'); + cy.get('body').contains(dynamicFixtures.product.localized_attributes[0].name).should('exist'); customerOverviewPage.viewLastPlacedOrder(); orderDetailsPage.containsOrderState('Editing in Progress'); @@ -114,8 +114,8 @@ import { DeactivateProductScenario } from '../../../support/scenarios/backoffice cy.contains(`Inactive item ${dynamicFixtures.productInActive.sku} was removed from your shopping cart.`).should( 'exist' ); - cy.get('body').contains(dynamicFixtures.product.name).should('exist'); - cy.get('body').contains(dynamicFixtures.productInActive.name).should('not.exist'); + cy.get('body').contains(dynamicFixtures.product.localized_attributes[0].name).should('exist'); + cy.get('body').contains(dynamicFixtures.productInActive.localized_attributes[0].name).should('not.exist'); }); it('customer should not be able to amend order when item was out-of-stock', (): void => { @@ -132,8 +132,8 @@ import { DeactivateProductScenario } from '../../../support/scenarios/backoffice cartPage.assertPageLocation(); cy.contains(`Product ${dynamicFixtures.productOutOfStock.sku} is not available at the moment.`).should('exist'); - cy.get('body').contains(dynamicFixtures.product.name).should('exist'); - cy.get('body').contains(dynamicFixtures.productOutOfStock.name).should('not.exist'); + cy.get('body').contains(dynamicFixtures.product.localized_attributes[0].name).should('exist'); + cy.get('body').contains(dynamicFixtures.productOutOfStock.localized_attributes[0].name).should('not.exist'); }); function placeCustomerOrder(email: string, idCustomerAddress: number): void { diff --git a/cypress/e2e/yves/reorder/reorder-concrete-products.cy.ts b/cypress/e2e/yves/reorder/reorder-concrete-products.cy.ts index aa71929a..a082c167 100644 --- a/cypress/e2e/yves/reorder/reorder-concrete-products.cy.ts +++ b/cypress/e2e/yves/reorder/reorder-concrete-products.cy.ts @@ -30,8 +30,8 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; cartPage.assertPageLocation(); cartPage.assertCartName(`Reorder from Order ${orderReference}`); - cy.get('body').contains(dynamicFixtures.product1.name).should('exist'); - cy.get('body').contains(dynamicFixtures.product2.name).should('exist'); + cy.get('body').contains(dynamicFixtures.product1.localized_attributes[0].name).should('exist'); + cy.get('body').contains(dynamicFixtures.product2.localized_attributes[0].name).should('exist'); }); }); @@ -45,8 +45,8 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; cartPage.assertPageLocation(); cartPage.assertCartName(`Reorder from Order ${orderReference}`); - cy.get('body').contains(dynamicFixtures.product1.name).should('exist'); - cy.get('body').contains(dynamicFixtures.product2.name).should('not.exist'); + cy.get('body').contains(dynamicFixtures.product1.localized_attributes[0].name).should('exist'); + cy.get('body').contains(dynamicFixtures.product2.localized_attributes[0].name).should('not.exist'); }); }); @@ -75,10 +75,7 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; password: staticFixtures.defaultPassword, }); - checkoutScenario.execute({ - idCustomerAddress: idCustomerAddress, - shouldTriggerOmsInCli: true, - }); + checkoutScenario.execute({ idCustomerAddress: idCustomerAddress }); } } ); diff --git a/cypress/e2e/yves/reorder/reorder-product-bundles.cy.ts b/cypress/e2e/yves/reorder/reorder-product-bundles.cy.ts index 95c0611a..02fd4537 100644 --- a/cypress/e2e/yves/reorder/reorder-product-bundles.cy.ts +++ b/cypress/e2e/yves/reorder/reorder-product-bundles.cy.ts @@ -28,7 +28,7 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; customerOverviewPage.viewLastPlacedOrder(); orderDetailsPage.reorderAll(); - cy.get('body').contains(dynamicFixtures.productBundle.name).should('exist'); + cy.get('body').contains(dynamicFixtures.productBundle.localized_attributes[0].name).should('exist'); }); function placeOrderWithProductBundle(): void { @@ -41,10 +41,7 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; catalogPage.searchProductFromSuggestions({ query: dynamicFixtures.productBundle.sku }); productPage.addToCart(); - checkoutScenario.execute({ - idCustomerAddress: dynamicFixtures.address.id_customer_address, - shouldTriggerOmsInCli: true, - }); + checkoutScenario.execute({ idCustomerAddress: dynamicFixtures.address.id_customer_address }); } } ); diff --git a/cypress/e2e/yves/reorder/reorder-product-offers.cy.ts b/cypress/e2e/yves/reorder/reorder-product-offers.cy.ts index 8f511d1e..7a089c15 100644 --- a/cypress/e2e/yves/reorder/reorder-product-offers.cy.ts +++ b/cypress/e2e/yves/reorder/reorder-product-offers.cy.ts @@ -34,10 +34,10 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; cartPage.assertCartName(`Reorder from Order ${orderReference}`); cy.get('body').contains(`Sold by ${dynamicFixtures.merchant1.name}`).should('exist'); - cy.get('body').contains(dynamicFixtures.product1.name).should('exist'); + cy.get('body').contains(dynamicFixtures.product1.localized_attributes[0].name).should('exist'); cy.get('body').contains(`Sold by ${dynamicFixtures.merchant2.name}`).should('exist'); - cy.get('body').contains(dynamicFixtures.product2.name).should('exist'); + cy.get('body').contains(dynamicFixtures.product2.localized_attributes[0].name).should('exist'); }); }); @@ -55,10 +55,7 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; catalogPage.searchProductFromSuggestions({ query: dynamicFixtures.product2.sku }); productPage.addToCart(); - checkoutScenario.execute({ - idCustomerAddress: dynamicFixtures.address.id_customer_address, - shouldTriggerOmsInCli: true, - }); + checkoutScenario.execute({ idCustomerAddress: dynamicFixtures.address.id_customer_address }); } } ); diff --git a/cypress/e2e/yves/reorder/reorder-random-weight-products.cy.ts b/cypress/e2e/yves/reorder/reorder-random-weight-products.cy.ts index 92c1918f..1bb6ee2c 100644 --- a/cypress/e2e/yves/reorder/reorder-random-weight-products.cy.ts +++ b/cypress/e2e/yves/reorder/reorder-random-weight-products.cy.ts @@ -29,8 +29,8 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; customerOverviewPage.viewLastPlacedOrder(); orderDetailsPage.reorderAll(); - cy.get('body').contains(dynamicFixtures.productMUnit.name).should('exist'); - cy.get('body').contains(dynamicFixtures.productPUnit.name).should('exist'); + cy.get('body').contains(dynamicFixtures.productMUnit.localized_attributes[0].name).should('exist'); + cy.get('body').contains(dynamicFixtures.productPUnit.localized_attributes[0].name).should('exist'); }); function placeOrderWithRandomWeightProducts(): void { @@ -47,10 +47,7 @@ import { CheckoutScenario, CustomerLoginScenario } from '@scenarios/yves'; catalogPage.searchProductFromSuggestions({ query: dynamicFixtures.productPUnit.sku }); productPage.addToCart(); - checkoutScenario.execute({ - idCustomerAddress: dynamicFixtures.address.id_customer_address, - shouldTriggerOmsInCli: true, - }); + checkoutScenario.execute({ idCustomerAddress: dynamicFixtures.address.id_customer_address }); } function triggerPublishEvents(): void { diff --git a/cypress/fixtures/b2b-mp/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json b/cypress/fixtures/b2b-mp/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json index c6873055..df1dce32 100644 --- a/cypress/fixtures/b2b-mp/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json +++ b/cypress/fixtures/b2b-mp/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json @@ -125,7 +125,6 @@ "name": "haveFullProduct", "key": "productConcreteForOffer", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -161,7 +160,6 @@ "name": "haveFullProduct", "key": "productConcreteForMerchant", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -274,7 +272,6 @@ "sku": "#productConcreteForOffer.sku", "abstractSku": "#productConcreteForOffer.abstract_sku", "idProductAbstract": "#productConcreteForOffer.fk_product_abstract", - "name": "#productConcreteForOffer.name", "productOfferReference": "#productOffer.product_offer_reference", "merchantReference": "#productOffer.merchant_reference", "quantity": 1, diff --git a/cypress/fixtures/b2b-mp/mp/marketplace-merchant-commission/dynamic-commission-calculation.json b/cypress/fixtures/b2b-mp/mp/marketplace-merchant-commission/dynamic-commission-calculation.json index 61b76d4c..c29cd082 100644 --- a/cypress/fixtures/b2b-mp/mp/marketplace-merchant-commission/dynamic-commission-calculation.json +++ b/cypress/fixtures/b2b-mp/mp/marketplace-merchant-commission/dynamic-commission-calculation.json @@ -217,7 +217,6 @@ "name": "haveFullProduct", "key": "concreteProduct1", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -272,7 +271,6 @@ "name": "haveFullProduct", "key": "concreteProduct2", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -327,7 +325,6 @@ "name": "haveFullProduct", "key": "concreteProduct3", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -382,7 +379,6 @@ "name": "haveFullProduct", "key": "concreteProduct4", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -437,7 +433,6 @@ "name": "haveFullProduct", "key": "concreteProduct5", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -664,7 +659,6 @@ { "sku": "#concreteProduct1.sku", "abstractSku": "#concreteProduct1.abstract_sku", - "name": "#concreteProduct1.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 100000 @@ -672,7 +666,6 @@ { "sku": "#concreteProduct2.sku", "abstractSku": "#concreteProduct2.abstract_sku", - "name": "#concreteProduct2.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -680,7 +673,6 @@ { "sku": "#concreteProduct3.sku", "abstractSku": "#concreteProduct3.abstract_sku", - "name": "#concreteProduct3.name", "merchantReference": "#merchant2.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -699,7 +691,6 @@ { "sku": "#concreteProduct1.sku", "abstractSku": "#concreteProduct1.abstract_sku", - "name": "#concreteProduct1.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 100000 @@ -707,7 +698,6 @@ { "sku": "#concreteProduct2.sku", "abstractSku": "#concreteProduct2.abstract_sku", - "name": "#concreteProduct2.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -715,7 +705,6 @@ { "sku": "#concreteProduct3.sku", "abstractSku": "#concreteProduct3.abstract_sku", - "name": "#concreteProduct3.name", "merchantReference": "#merchant2.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -734,7 +723,6 @@ { "sku": "#concreteProduct1.sku", "abstractSku": "#concreteProduct1.abstract_sku", - "name": "#concreteProduct1.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 100000 @@ -742,7 +730,6 @@ { "sku": "#concreteProduct2.sku", "abstractSku": "#concreteProduct2.abstract_sku", - "name": "#concreteProduct2.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -750,7 +737,6 @@ { "sku": "#concreteProduct3.sku", "abstractSku": "#concreteProduct3.abstract_sku", - "name": "#concreteProduct3.name", "merchantReference": "#merchant2.merchant_reference", "quantity": 2, "unitPrice": 20000 diff --git a/cypress/fixtures/b2b-mp/mp/marketplace-product-concretes/dynamic-product-concrete-management.json b/cypress/fixtures/b2b-mp/mp/marketplace-product-concretes/dynamic-product-concrete-management.json index b7d73340..fda324d4 100644 --- a/cypress/fixtures/b2b-mp/mp/marketplace-product-concretes/dynamic-product-concrete-management.json +++ b/cypress/fixtures/b2b-mp/mp/marketplace-product-concretes/dynamic-product-concrete-management.json @@ -73,7 +73,6 @@ "name": "haveFullProduct", "key": "concreteProduct1", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -88,7 +87,6 @@ "name": "haveFullProduct", "key": "concreteProduct2", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/b2b-mp/mp/merchant-b2b-contract-requests/dynamic-request-management.json b/cypress/fixtures/b2b-mp/mp/merchant-b2b-contract-requests/dynamic-request-management.json index 620490f5..b5991e9c 100644 --- a/cypress/fixtures/b2b-mp/mp/merchant-b2b-contract-requests/dynamic-request-management.json +++ b/cypress/fixtures/b2b-mp/mp/merchant-b2b-contract-requests/dynamic-request-management.json @@ -228,7 +228,6 @@ "name": "haveFullProduct", "key": "concreteProduct", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/b2b-mp/yves/cart/dynamic-cart-item-note-management.json b/cypress/fixtures/b2b-mp/yves/cart/dynamic-cart-item-note-management.json index eab20cb0..7d9bfc60 100644 --- a/cypress/fixtures/b2b-mp/yves/cart/dynamic-cart-item-note-management.json +++ b/cypress/fixtures/b2b-mp/yves/cart/dynamic-cart-item-note-management.json @@ -112,7 +112,6 @@ "name": "haveFullProduct", "key": "product", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [{ "locale": "#locale", "name": "#localizedAttribute1.name" }] diff --git a/cypress/fixtures/b2b-mp/yves/cart/dynamic-change-cart-item-quantity.json b/cypress/fixtures/b2b-mp/yves/cart/dynamic-change-cart-item-quantity.json index 20015198..cae60767 100644 --- a/cypress/fixtures/b2b-mp/yves/cart/dynamic-change-cart-item-quantity.json +++ b/cypress/fixtures/b2b-mp/yves/cart/dynamic-change-cart-item-quantity.json @@ -112,7 +112,6 @@ "name": "haveFullProduct", "key": "product", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [{ "locale": "#locale", "name": "#localizedAttribute1.name" }] diff --git a/cypress/fixtures/b2b-mp/yves/cart/dynamic-remove-cart-item.json b/cypress/fixtures/b2b-mp/yves/cart/dynamic-remove-cart-item.json index 25d5dc17..47684e55 100644 --- a/cypress/fixtures/b2b-mp/yves/cart/dynamic-remove-cart-item.json +++ b/cypress/fixtures/b2b-mp/yves/cart/dynamic-remove-cart-item.json @@ -112,7 +112,6 @@ "name": "haveFullProduct", "key": "product1", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [{ "locale": "#locale", "name": "#localizedAttribute1.name" }] @@ -124,7 +123,6 @@ "name": "haveFullProduct", "key": "product2", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [{ "locale": "#locale", "name": "#localizedAttribute1.name" }] diff --git a/cypress/fixtures/b2b-mp/yves/checkout/dynamic-basic-checkout.json b/cypress/fixtures/b2b-mp/yves/checkout/dynamic-basic-checkout.json index af714041..ed0e6eea 100644 --- a/cypress/fixtures/b2b-mp/yves/checkout/dynamic-basic-checkout.json +++ b/cypress/fixtures/b2b-mp/yves/checkout/dynamic-basic-checkout.json @@ -177,7 +177,6 @@ "name": "haveFullProduct", "key": "product1", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -192,7 +191,6 @@ "name": "haveFullProduct", "key": "product2", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/b2b-mp/yves/merchant-b2b-contract-requests/dynamic-request-creation.json b/cypress/fixtures/b2b-mp/yves/merchant-b2b-contract-requests/dynamic-request-creation.json index 75835843..431099dd 100644 --- a/cypress/fixtures/b2b-mp/yves/merchant-b2b-contract-requests/dynamic-request-creation.json +++ b/cypress/fixtures/b2b-mp/yves/merchant-b2b-contract-requests/dynamic-request-creation.json @@ -184,7 +184,6 @@ "name": "haveFullProduct", "key": "concreteProduct", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/b2b-mp/yves/merchant-b2b-contract-requests/dynamic-request-management.json b/cypress/fixtures/b2b-mp/yves/merchant-b2b-contract-requests/dynamic-request-management.json index 46676b6b..275626fd 100644 --- a/cypress/fixtures/b2b-mp/yves/merchant-b2b-contract-requests/dynamic-request-management.json +++ b/cypress/fixtures/b2b-mp/yves/merchant-b2b-contract-requests/dynamic-request-management.json @@ -184,7 +184,6 @@ "name": "haveFullProduct", "key": "concreteProduct", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/b2c-mp/backoffice/order-management/dynamic-order-creation.json b/cypress/fixtures/b2c-mp/backoffice/order-management/dynamic-order-creation.json index 26d59058..239fe0a1 100644 --- a/cypress/fixtures/b2c-mp/backoffice/order-management/dynamic-order-creation.json +++ b/cypress/fixtures/b2c-mp/backoffice/order-management/dynamic-order-creation.json @@ -114,7 +114,6 @@ "name": "haveFullProduct", "key": "product", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/b2c-mp/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json b/cypress/fixtures/b2c-mp/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json index 79ae41b5..fb3b048c 100644 --- a/cypress/fixtures/b2c-mp/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json +++ b/cypress/fixtures/b2c-mp/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json @@ -125,7 +125,6 @@ "name": "haveFullProduct", "key": "productConcreteForOffer", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -161,7 +160,6 @@ "name": "haveFullProduct", "key": "productConcreteForMerchant", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -274,7 +272,6 @@ "sku": "#productConcreteForOffer.sku", "abstractSku": "#productConcreteForOffer.abstract_sku", "idProductAbstract": "#productConcreteForOffer.fk_product_abstract", - "name": "#productConcreteForOffer.name", "productOfferReference": "#productOffer.product_offer_reference", "merchantReference": "#productOffer.merchant_reference", "quantity": 1, diff --git a/cypress/fixtures/b2c-mp/mp/marketplace-merchant-commission/dynamic-commission-calculation.json b/cypress/fixtures/b2c-mp/mp/marketplace-merchant-commission/dynamic-commission-calculation.json index cc5268d8..0e03fb2a 100644 --- a/cypress/fixtures/b2c-mp/mp/marketplace-merchant-commission/dynamic-commission-calculation.json +++ b/cypress/fixtures/b2c-mp/mp/marketplace-merchant-commission/dynamic-commission-calculation.json @@ -217,7 +217,6 @@ "name": "haveFullProduct", "key": "concreteProduct1", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -272,7 +271,6 @@ "name": "haveFullProduct", "key": "concreteProduct2", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -327,7 +325,6 @@ "name": "haveFullProduct", "key": "concreteProduct3", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -382,7 +379,6 @@ "name": "haveFullProduct", "key": "concreteProduct4", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -437,7 +433,6 @@ "name": "haveFullProduct", "key": "concreteProduct5", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -664,7 +659,6 @@ { "sku": "#concreteProduct1.sku", "abstractSku": "#concreteProduct1.abstract_sku", - "name": "#concreteProduct1.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 100000 @@ -672,7 +666,6 @@ { "sku": "#concreteProduct2.sku", "abstractSku": "#concreteProduct2.abstract_sku", - "name": "#concreteProduct2.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -680,7 +673,6 @@ { "sku": "#concreteProduct3.sku", "abstractSku": "#concreteProduct3.abstract_sku", - "name": "#concreteProduct3.name", "merchantReference": "#merchant2.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -699,7 +691,6 @@ { "sku": "#concreteProduct1.sku", "abstractSku": "#concreteProduct1.abstract_sku", - "name": "#concreteProduct1.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 100000 @@ -707,15 +698,12 @@ { "sku": "#concreteProduct2.sku", "abstractSku": "#concreteProduct2.abstract_sku", - "name": "#concreteProduct2.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 20000 }, { "sku": "#concreteProduct3.sku", - "abstractSku": "#concreteProduct3.abstract_sku", - "name": "#concreteProduct3.name", "merchantReference": "#merchant2.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -734,7 +722,6 @@ { "sku": "#concreteProduct1.sku", "abstractSku": "#concreteProduct1.abstract_sku", - "name": "#concreteProduct1.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 100000 @@ -742,7 +729,6 @@ { "sku": "#concreteProduct2.sku", "abstractSku": "#concreteProduct2.abstract_sku", - "name": "#concreteProduct2.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -750,7 +736,6 @@ { "sku": "#concreteProduct3.sku", "abstractSku": "#concreteProduct3.abstract_sku", - "name": "#concreteProduct3.name", "merchantReference": "#merchant2.merchant_reference", "quantity": 2, "unitPrice": 20000 diff --git a/cypress/fixtures/b2c-mp/mp/marketplace-product-concretes/dynamic-product-concrete-management.json b/cypress/fixtures/b2c-mp/mp/marketplace-product-concretes/dynamic-product-concrete-management.json index b7d73340..fda324d4 100644 --- a/cypress/fixtures/b2c-mp/mp/marketplace-product-concretes/dynamic-product-concrete-management.json +++ b/cypress/fixtures/b2c-mp/mp/marketplace-product-concretes/dynamic-product-concrete-management.json @@ -73,7 +73,6 @@ "name": "haveFullProduct", "key": "concreteProduct1", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -88,7 +87,6 @@ "name": "haveFullProduct", "key": "concreteProduct2", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/b2c-mp/yves/checkout/dynamic-basic-checkout.json b/cypress/fixtures/b2c-mp/yves/checkout/dynamic-basic-checkout.json index 3b875a7d..8da97f55 100644 --- a/cypress/fixtures/b2c-mp/yves/checkout/dynamic-basic-checkout.json +++ b/cypress/fixtures/b2c-mp/yves/checkout/dynamic-basic-checkout.json @@ -108,7 +108,6 @@ "name": "haveFullProduct", "key": "product1", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -123,7 +122,6 @@ "name": "haveFullProduct", "key": "product2", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/suite/backoffice/order-management/dynamic-custom-order-reference-management.json b/cypress/fixtures/suite/backoffice/order-management/dynamic-custom-order-reference-management.json index 6f0e6d9c..61b92d39 100644 --- a/cypress/fixtures/suite/backoffice/order-management/dynamic-custom-order-reference-management.json +++ b/cypress/fixtures/suite/backoffice/order-management/dynamic-custom-order-reference-management.json @@ -98,7 +98,6 @@ { "sku": "#product.sku", "abstractSku": "#product.abstract_sku", - "name": "#product.name", "quantity": 1, "unitPrice": 30000 } diff --git a/cypress/fixtures/suite/backoffice/order-management/dynamic-order-creation.json b/cypress/fixtures/suite/backoffice/order-management/dynamic-order-creation.json index 6f0e6d9c..61b92d39 100644 --- a/cypress/fixtures/suite/backoffice/order-management/dynamic-order-creation.json +++ b/cypress/fixtures/suite/backoffice/order-management/dynamic-order-creation.json @@ -98,7 +98,6 @@ { "sku": "#product.sku", "abstractSku": "#product.abstract_sku", - "name": "#product.name", "quantity": 1, "unitPrice": 30000 } diff --git a/cypress/fixtures/suite/backoffice/return-management/dynamic-return-creation.json b/cypress/fixtures/suite/backoffice/return-management/dynamic-return-creation.json index 66d4f16a..ac37f7a2 100644 --- a/cypress/fixtures/suite/backoffice/return-management/dynamic-return-creation.json +++ b/cypress/fixtures/suite/backoffice/return-management/dynamic-return-creation.json @@ -105,7 +105,6 @@ { "sku": "#product.sku", "abstractSku": "#product.abstract_sku", - "name": "#product.name", "quantity": 1, "unitPrice": 30000 } @@ -123,7 +122,6 @@ { "sku": "#product.sku", "abstractSku": "#product.abstract_sku", - "name": "#product.name", "quantity": 1, "unitPrice": 30000 } @@ -141,7 +139,6 @@ { "sku": "#product.sku", "abstractSku": "#product.abstract_sku", - "name": "#product.name", "quantity": 1, "unitPrice": 30000 } @@ -159,7 +156,6 @@ { "sku": "#product.sku", "abstractSku": "#product.abstract_sku", - "name": "#product.name", "quantity": 1, "unitPrice": 30000 } diff --git a/cypress/fixtures/suite/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json b/cypress/fixtures/suite/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json index 79ae41b5..fb3b048c 100644 --- a/cypress/fixtures/suite/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json +++ b/cypress/fixtures/suite/mp/marketplace-agent-assist/dynamic-agent-merchant-portal.json @@ -125,7 +125,6 @@ "name": "haveFullProduct", "key": "productConcreteForOffer", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -161,7 +160,6 @@ "name": "haveFullProduct", "key": "productConcreteForMerchant", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -274,7 +272,6 @@ "sku": "#productConcreteForOffer.sku", "abstractSku": "#productConcreteForOffer.abstract_sku", "idProductAbstract": "#productConcreteForOffer.fk_product_abstract", - "name": "#productConcreteForOffer.name", "productOfferReference": "#productOffer.product_offer_reference", "merchantReference": "#productOffer.merchant_reference", "quantity": 1, diff --git a/cypress/fixtures/suite/mp/marketplace-merchant-commission/dynamic-commission-calculation.json b/cypress/fixtures/suite/mp/marketplace-merchant-commission/dynamic-commission-calculation.json index cc5268d8..4d163857 100644 --- a/cypress/fixtures/suite/mp/marketplace-merchant-commission/dynamic-commission-calculation.json +++ b/cypress/fixtures/suite/mp/marketplace-merchant-commission/dynamic-commission-calculation.json @@ -217,7 +217,6 @@ "name": "haveFullProduct", "key": "concreteProduct1", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -272,7 +271,6 @@ "name": "haveFullProduct", "key": "concreteProduct2", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -327,7 +325,6 @@ "name": "haveFullProduct", "key": "concreteProduct3", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -382,7 +379,6 @@ "name": "haveFullProduct", "key": "concreteProduct4", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -437,7 +433,6 @@ "name": "haveFullProduct", "key": "concreteProduct5", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -664,7 +659,6 @@ { "sku": "#concreteProduct1.sku", "abstractSku": "#concreteProduct1.abstract_sku", - "name": "#concreteProduct1.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 100000 @@ -672,7 +666,6 @@ { "sku": "#concreteProduct2.sku", "abstractSku": "#concreteProduct2.abstract_sku", - "name": "#concreteProduct2.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -680,7 +673,6 @@ { "sku": "#concreteProduct3.sku", "abstractSku": "#concreteProduct3.abstract_sku", - "name": "#concreteProduct3.name", "merchantReference": "#merchant2.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -699,7 +691,6 @@ { "sku": "#concreteProduct1.sku", "abstractSku": "#concreteProduct1.abstract_sku", - "name": "#concreteProduct1.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 100000 @@ -707,7 +698,6 @@ { "sku": "#concreteProduct2.sku", "abstractSku": "#concreteProduct2.abstract_sku", - "name": "#concreteProduct2.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -715,7 +705,6 @@ { "sku": "#concreteProduct3.sku", "abstractSku": "#concreteProduct3.abstract_sku", - "name": "#concreteProduct3.name", "merchantReference": "#merchant2.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -734,7 +723,6 @@ { "sku": "#concreteProduct1.sku", "abstractSku": "#concreteProduct1.abstract_sku", - "name": "#concreteProduct1.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 100000 @@ -742,7 +730,6 @@ { "sku": "#concreteProduct2.sku", "abstractSku": "#concreteProduct2.abstract_sku", - "name": "#concreteProduct2.name", "merchantReference": "#merchant1.merchant_reference", "quantity": 2, "unitPrice": 20000 @@ -750,7 +737,6 @@ { "sku": "#concreteProduct3.sku", "abstractSku": "#concreteProduct3.abstract_sku", - "name": "#concreteProduct3.name", "merchantReference": "#merchant2.merchant_reference", "quantity": 2, "unitPrice": 20000 diff --git a/cypress/fixtures/suite/mp/marketplace-product-concretes/dynamic-product-concrete-management.json b/cypress/fixtures/suite/mp/marketplace-product-concretes/dynamic-product-concrete-management.json index b7d73340..fda324d4 100644 --- a/cypress/fixtures/suite/mp/marketplace-product-concretes/dynamic-product-concrete-management.json +++ b/cypress/fixtures/suite/mp/marketplace-product-concretes/dynamic-product-concrete-management.json @@ -73,7 +73,6 @@ "name": "haveFullProduct", "key": "concreteProduct1", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ @@ -88,7 +87,6 @@ "name": "haveFullProduct", "key": "concreteProduct2", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/suite/mp/merchant-b2b-contract-requests/dynamic-request-management.json b/cypress/fixtures/suite/mp/merchant-b2b-contract-requests/dynamic-request-management.json index 620490f5..b5991e9c 100644 --- a/cypress/fixtures/suite/mp/merchant-b2b-contract-requests/dynamic-request-management.json +++ b/cypress/fixtures/suite/mp/merchant-b2b-contract-requests/dynamic-request-management.json @@ -228,7 +228,6 @@ "name": "haveFullProduct", "key": "concreteProduct", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/suite/yves/checkout/dynamic-basic-checkout.json b/cypress/fixtures/suite/yves/checkout/dynamic-basic-checkout.json index fa695dc6..7a5ebd85 100644 --- a/cypress/fixtures/suite/yves/checkout/dynamic-basic-checkout.json +++ b/cypress/fixtures/suite/yves/checkout/dynamic-basic-checkout.json @@ -134,14 +134,12 @@ { "sku": "#product1.sku", "abstractSku": "#product1.abstract_sku", - "name": "#product1.name", "quantity": 1, "unitPrice": 30000 }, { "sku": "#product2.sku", "abstractSku": "#product2.abstract_sku", - "name": "#product2.name", "quantity": 1, "unitPrice": 30000 } @@ -160,14 +158,12 @@ { "sku": "#product1.sku", "abstractSku": "#product1.abstract_sku", - "name": "#product1.name", "quantity": 1, "unitPrice": 30000 }, { "sku": "#product2.sku", "abstractSku": "#product2.abstract_sku", - "name": "#product2.name", "quantity": 1, "unitPrice": 30000 } @@ -186,14 +182,12 @@ { "sku": "#product1.sku", "abstractSku": "#product1.abstract_sku", - "name": "#product1.name", "quantity": 1, "unitPrice": 30000 }, { "sku": "#product2.sku", "abstractSku": "#product2.abstract_sku", - "name": "#product2.name", "quantity": 1, "unitPrice": 30000 } @@ -212,14 +206,12 @@ { "sku": "#product1.sku", "abstractSku": "#product1.abstract_sku", - "name": "#product1.name", "quantity": 1, "unitPrice": 30000 }, { "sku": "#product2.sku", "abstractSku": "#product2.abstract_sku", - "name": "#product2.name", "quantity": 1, "unitPrice": 30000 } diff --git a/cypress/fixtures/suite/yves/merchant-b2b-contract-requests/dynamic-request-creation.json b/cypress/fixtures/suite/yves/merchant-b2b-contract-requests/dynamic-request-creation.json index 75835843..431099dd 100644 --- a/cypress/fixtures/suite/yves/merchant-b2b-contract-requests/dynamic-request-creation.json +++ b/cypress/fixtures/suite/yves/merchant-b2b-contract-requests/dynamic-request-creation.json @@ -184,7 +184,6 @@ "name": "haveFullProduct", "key": "concreteProduct", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/suite/yves/merchant-b2b-contract-requests/dynamic-request-management.json b/cypress/fixtures/suite/yves/merchant-b2b-contract-requests/dynamic-request-management.json index 46676b6b..275626fd 100644 --- a/cypress/fixtures/suite/yves/merchant-b2b-contract-requests/dynamic-request-management.json +++ b/cypress/fixtures/suite/yves/merchant-b2b-contract-requests/dynamic-request-management.json @@ -184,7 +184,6 @@ "name": "haveFullProduct", "key": "concreteProduct", "arguments": [ - {}, { "idTaxSet": 1, "localizedAttributes": [ diff --git a/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-cancel.json b/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-cancel.json index 66d18c05..53293fe2 100644 --- a/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-cancel.json +++ b/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-cancel.json @@ -51,7 +51,7 @@ "type": "helper", "name": "haveFullProduct", "key": "product", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", diff --git a/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-finish.json b/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-finish.json index 9136ad1a..ee60392a 100644 --- a/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-finish.json +++ b/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-finish.json @@ -68,7 +68,7 @@ "type": "helper", "name": "haveFullProduct", "key": "product1", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", @@ -102,7 +102,7 @@ "type": "helper", "name": "haveFullProduct", "key": "product2", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", diff --git a/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-start.json b/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-start.json index 554e7985..5b8e3699 100644 --- a/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-start.json +++ b/cypress/fixtures/suite/yves/order-amendment/dynamic-order-amendment-start.json @@ -147,7 +147,7 @@ "type": "helper", "name": "haveFullProduct", "key": "product", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", @@ -181,7 +181,7 @@ "type": "helper", "name": "haveFullProduct", "key": "productInActive", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", @@ -215,7 +215,7 @@ "type": "helper", "name": "haveFullProduct", "key": "productOutOfStock", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", diff --git a/cypress/fixtures/suite/yves/product-comparison/dynamic-product-comparison.json b/cypress/fixtures/suite/yves/product-comparison/dynamic-product-comparison.json index 4b09b8ae..4054efcb 100644 --- a/cypress/fixtures/suite/yves/product-comparison/dynamic-product-comparison.json +++ b/cypress/fixtures/suite/yves/product-comparison/dynamic-product-comparison.json @@ -8,19 +8,27 @@ "type": "transfer", "name": "StoreTransfer", "key": "store", - "arguments": { "id_store": 1 } + "arguments": { + "id_store": 1 + } }, { "type": "transfer", "name": "LocaleTransfer", "key": "localeEN", - "arguments": { "id_locale": 66, "locale_name": "en_US" } + "arguments": { + "id_locale": 66, + "locale_name": "en_US" + } }, { "type": "transfer", "name": "LocaleTransfer", "key": "localeDE", - "arguments": { "id_locale": 46, "locale_name": "de_DE" } + "arguments": { + "id_locale": 46, + "locale_name": "de_DE" + } }, { "type": "builder", @@ -45,13 +53,17 @@ "attributes": { "attribute_key_1": "attribute_value_1-1", "attribute_key_2": "attribute_value_2-1" - } - }, - { + }, "idTaxSet": 1, "localizedAttributes": [ - { "locale": "#localeEN", "name": "#localizedAttribute.name" }, - { "locale": "#localeDE", "name": "#localizedAttribute.name" } + { + "locale": "#localeEN", + "name": "#localizedAttribute.name" + }, + { + "locale": "#localeDE", + "name": "#localizedAttribute.name" + } ] } ] @@ -87,7 +99,13 @@ "type": "helper", "name": "haveProductInStockForStore", "key": "product1WithPriceAndStore", - "arguments": ["#store", { "sku": "#product1.sku", "isNeverOutOfStock": "1" }] + "arguments": [ + "#store", + { + "sku": "#product1.sku", + "isNeverOutOfStock": "1" + } + ] }, { "type": "helper", @@ -98,13 +116,17 @@ "attributes": { "attribute_key_1": "attribute_value_1-2", "attribute_key_2": "attribute_value_2-2" - } - }, - { + }, "idTaxSet": 1, "localizedAttributes": [ - { "locale": "#localeEN", "name": "#localizedAttribute.name" }, - { "locale": "#localeDE", "name": "#localizedAttribute.name" } + { + "locale": "#localeEN", + "name": "#localizedAttribute.name" + }, + { + "locale": "#localeDE", + "name": "#localizedAttribute.name" + } ] } ] @@ -129,7 +151,10 @@ { "skuProductAbstract": "#product2.abstract_sku", "skuProduct": "#product2.sku", - "moneyValue": { "netAmount": 30000, "grossAmount": 30000 } + "moneyValue": { + "netAmount": 30000, + "grossAmount": 30000 + } } ] }, @@ -137,7 +162,13 @@ "type": "helper", "name": "haveProductInStockForStore", "key": "product2WithPriceAndStore", - "arguments": ["#store", { "sku": "#product2.sku", "isNeverOutOfStock": "1" }] + "arguments": [ + "#store", + { + "sku": "#product2.sku", + "isNeverOutOfStock": "1" + } + ] }, { "type": "helper", @@ -147,13 +178,17 @@ { "attributes": { "attribute_key_1": "attribute_value_1-3" - } - }, - { + }, "idTaxSet": 1, "localizedAttributes": [ - { "locale": "#localeEN", "name": "#localizedAttribute.name" }, - { "locale": "#localeDE", "name": "#localizedAttribute.name" } + { + "locale": "#localeEN", + "name": "#localizedAttribute.name" + }, + { + "locale": "#localeDE", + "name": "#localizedAttribute.name" + } ] } ] @@ -178,7 +213,10 @@ { "skuProductAbstract": "#product3.abstract_sku", "skuProduct": "#product3.sku", - "moneyValue": { "netAmount": 30000, "grossAmount": 30000 } + "moneyValue": { + "netAmount": 30000, + "grossAmount": 30000 + } } ] }, @@ -186,7 +224,13 @@ "type": "helper", "name": "haveProductInStockForStore", "key": "product3WithPriceAndStore", - "arguments": ["#store", { "sku": "#product3.sku", "isNeverOutOfStock": "1" }] + "arguments": [ + "#store", + { + "sku": "#product3.sku", + "isNeverOutOfStock": "1" + } + ] }, { "type": "helper", @@ -197,13 +241,17 @@ "attributes": { "attribute_key_1": "attribute_value_1-4", "attribute_key_2": "attribute_value_2-4" - } - }, - { + }, "idTaxSet": 1, "localizedAttributes": [ - { "locale": "#localeEN", "name": "#localizedAttribute.name" }, - { "locale": "#localeDE", "name": "#localizedAttribute.name" } + { + "locale": "#localeEN", + "name": "#localizedAttribute.name" + }, + { + "locale": "#localeDE", + "name": "#localizedAttribute.name" + } ] } ] @@ -228,7 +276,10 @@ { "skuProductAbstract": "#product4.abstract_sku", "skuProduct": "#product4.sku", - "moneyValue": { "netAmount": 30000, "grossAmount": 30000 } + "moneyValue": { + "netAmount": 30000, + "grossAmount": 30000 + } } ] }, @@ -236,7 +287,13 @@ "type": "helper", "name": "haveProductInStockForStore", "key": "product4WithPriceAndStore", - "arguments": ["#store", { "sku": "#product4.sku", "isNeverOutOfStock": "1" }] + "arguments": [ + "#store", + { + "sku": "#product4.sku", + "isNeverOutOfStock": "1" + } + ] } ] } diff --git a/cypress/fixtures/suite/yves/reorder/dynamic-reorder-concrete-products.json b/cypress/fixtures/suite/yves/reorder/dynamic-reorder-concrete-products.json index c259f3b5..13fedf2f 100644 --- a/cypress/fixtures/suite/yves/reorder/dynamic-reorder-concrete-products.json +++ b/cypress/fixtures/suite/yves/reorder/dynamic-reorder-concrete-products.json @@ -102,7 +102,7 @@ "type": "helper", "name": "haveFullProduct", "key": "product1", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", @@ -136,7 +136,7 @@ "type": "helper", "name": "haveFullProduct", "key": "product2", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", diff --git a/cypress/fixtures/suite/yves/reorder/dynamic-reorder-product-bundles.json b/cypress/fixtures/suite/yves/reorder/dynamic-reorder-product-bundles.json index 1c7b608d..d7ab03d1 100644 --- a/cypress/fixtures/suite/yves/reorder/dynamic-reorder-product-bundles.json +++ b/cypress/fixtures/suite/yves/reorder/dynamic-reorder-product-bundles.json @@ -60,19 +60,19 @@ "type": "helper", "name": "haveFullProduct", "key": "product", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", "name": "haveFullProduct", "key": "bundledProduct1", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", "name": "haveFullProduct", "key": "bundledProduct2", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", diff --git a/cypress/fixtures/suite/yves/reorder/dynamic-reorder-product-offers.json b/cypress/fixtures/suite/yves/reorder/dynamic-reorder-product-offers.json index 2af78d46..32ee118a 100644 --- a/cypress/fixtures/suite/yves/reorder/dynamic-reorder-product-offers.json +++ b/cypress/fixtures/suite/yves/reorder/dynamic-reorder-product-offers.json @@ -56,7 +56,7 @@ "type": "helper", "name": "haveFullProduct", "key": "product1", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", @@ -133,7 +133,7 @@ "type": "helper", "name": "haveFullProduct", "key": "product2", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", diff --git a/cypress/fixtures/suite/yves/reorder/dynamic-reorder-random-weight-products.json b/cypress/fixtures/suite/yves/reorder/dynamic-reorder-random-weight-products.json index b0e5beb8..1de48976 100644 --- a/cypress/fixtures/suite/yves/reorder/dynamic-reorder-random-weight-products.json +++ b/cypress/fixtures/suite/yves/reorder/dynamic-reorder-random-weight-products.json @@ -60,7 +60,7 @@ "type": "helper", "name": "haveFullProduct", "key": "productMUnit", - "arguments": [{}, { "idTaxSet": 1 }] + "arguments": [{ "idTaxSet": 1 }] }, { "type": "helper", diff --git a/cypress/support/pages/mp/products/products-page.ts b/cypress/support/pages/mp/products/products-page.ts index 8134badb..17d4bc0e 100644 --- a/cypress/support/pages/mp/products/products-page.ts +++ b/cypress/support/pages/mp/products/products-page.ts @@ -40,6 +40,14 @@ export class ProductsPage extends MpPage { getSaveButtonSelector = (): string => { return this.repository.getSaveButtonSelector(); }; + + getTaxIdSetSelector = (): string => { + return this.repository.getTaxIdSelector(); + }; + + getTaxIdSetOptionSelector = (): string => { + return this.repository.getTaxIdOptionSelector(); + }; } interface FindParams { diff --git a/cypress/support/pages/mp/products/products-repository.ts b/cypress/support/pages/mp/products/products-repository.ts index 6d52686c..93195551 100644 --- a/cypress/support/pages/mp/products/products-repository.ts +++ b/cypress/support/pages/mp/products/products-repository.ts @@ -7,5 +7,7 @@ export class ProductsRepository { getFirstTableRow = (): Cypress.Chainable => cy.get('tbody > :nth-child(1):visible'); getSearchSelector = (): string => '.spy-table-search-feature input[type="text"]'; getSaveButtonSelector = (): string => 'button:contains("Save")'; + getTaxIdSelector = (): string => 'select[name="productAbstract[idTaxSet]"]'; + getTaxIdOptionSelector = (): string => 'select[name="productAbstract[idTaxSet]"] > option'; getDrawer = (): Cypress.Chainable => cy.get('.spy-drawer-wrapper'); } diff --git a/cypress/support/types/yves/shared/index.ts b/cypress/support/types/yves/shared/index.ts index 9f14e1fb..a44bd53e 100644 --- a/cypress/support/types/yves/shared/index.ts +++ b/cypress/support/types/yves/shared/index.ts @@ -12,3 +12,4 @@ export * from './user'; export * from './merchant-relation-request'; export * from './discount'; export * from './product-option-value'; +export * from './product-localized-attributes'; diff --git a/cypress/support/types/yves/shared/product-concrete.ts b/cypress/support/types/yves/shared/product-concrete.ts index 33636920..af98fb6d 100644 --- a/cypress/support/types/yves/shared/product-concrete.ts +++ b/cypress/support/types/yves/shared/product-concrete.ts @@ -1,7 +1,9 @@ +import { ProductLocalizedAttributes } from './product-localized-attributes'; + export interface ProductConcrete { id_product_concrete: number; sku: string; abstract_sku: string; - name: string; attributes: object; + localized_attributes: ProductLocalizedAttributes[]; } diff --git a/cypress/support/types/yves/shared/product-localized-attributes.ts b/cypress/support/types/yves/shared/product-localized-attributes.ts new file mode 100644 index 00000000..e54e8e88 --- /dev/null +++ b/cypress/support/types/yves/shared/product-localized-attributes.ts @@ -0,0 +1,4 @@ +export interface ProductLocalizedAttributes { + name: string; + description: string; +}