-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.4-develop' of github.com:magento/magento2ce into impo…
…rted-magento-magento2-30565
- Loading branch information
Showing
43 changed files
with
617 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
.../Magento/Checkout/Test/Mftf/ActionGroup/CheckoutSelectPurchaseOrderPaymentActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="CheckoutSelectPurchaseOrderPaymentActionGroup"> | ||
| <annotations> | ||
| <description>Selects the 'Purchase Order' Payment Method on the Storefront Checkout page.</description> | ||
| </annotations> | ||
|
|
||
| <arguments> | ||
| <argument name="purchaseOrderNumber" type="string"/> | ||
| </arguments> | ||
| <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/> | ||
| <waitForPageLoad stepKey="waitForPageLoad"/> | ||
| <remove keyForRemoval="checkCheckMoneyOption"/> | ||
| <conditionalClick selector="{{CheckoutPaymentSection.purchaseOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.purchaseOrderPayment}}" visible="true" stepKey="checkPurchaseOrderOption"/> | ||
| <fillField selector="{{StorefrontCheckoutPaymentMethodSection.purchaseOrderNumber}}" userInput="{{purchaseOrderNumber}}" stepKey="fillPurchaseOrderNumber"/> | ||
| <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterPaymentMethodSelection"/> | ||
| </actionGroup> | ||
| </actionGroups> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
...to/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
|
|
||
| <test name="StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest"> | ||
| <annotations> | ||
| <features value="Checkout"/> | ||
| <stories value="Checkout with Purchase Order Payment. Create Order with Press Key Enter."/> | ||
| <title value="Create Checkout with purchase order payment method test. Press key Enter on field Purchase Order Number for create Order."/> | ||
| <description value="Create Checkout with purchase order payment method. Press key Enter on field Purchase Order Number for create Order."/> | ||
| <severity value="MAJOR"/> | ||
| <testCaseId value="MC-37227"/> | ||
| <group value="checkout"/> | ||
| </annotations> | ||
|
|
||
| <before> | ||
| <createData entity="SimpleTwo" stepKey="createSimpleProduct"/> | ||
|
|
||
| <!-- Enable payment method --> | ||
| <magentoCLI command="config:set {{PurchaseOrderEnableConfigData.path}} {{PurchaseOrderEnableConfigData.value}}" stepKey="enablePaymentMethod"/> | ||
| </before> | ||
|
|
||
| <after> | ||
| <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/> | ||
| <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/> | ||
|
|
||
| <!-- Disable payment method --> | ||
| <magentoCLI command="config:set {{PurchaseOrderDisabledConfigData.path}} {{PurchaseOrderDisabledConfigData.value}}" stepKey="disablePaymentMethod"/> | ||
| </after> | ||
|
|
||
| <!--Go to product page--> | ||
| <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/> | ||
| <waitForPageLoad stepKey="waitForCatalogPageLoad"/> | ||
|
|
||
| <!--Add Product to Shopping Cart--> | ||
| <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"> | ||
| <argument name="productName" value="$$createSimpleProduct.name$$"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to Checkout--> | ||
| <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/> | ||
|
|
||
| <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection"> | ||
| <argument name="customerVar" value="CustomerEntityOne"/> | ||
| <argument name="customerAddressVar" value="CustomerAddressSimple"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Checkout select Purchase Order payment --> | ||
| <actionGroup ref="CheckoutSelectPurchaseOrderPaymentActionGroup" stepKey="selectPurchaseOrderPayment"> | ||
| <argument name="purchaseOrderNumber" value="12345"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Press Key ENTER--> | ||
| <pressKey selector="{{StorefrontCheckoutPaymentMethodSection.purchaseOrderNumber}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKeyEnter"/> | ||
| <waitForPageLoad stepKey="waitForPageLoad"/> | ||
|
|
||
| <!--See success messages--> | ||
| <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/> | ||
| <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order # is: " stepKey="seeOrderNumber"/> | ||
|
|
||
| </test> | ||
|
|
||
| </tests> |
67 changes: 67 additions & 0 deletions
67
app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
| <test name="StorefrontCheckoutWithPurchaseOrderNumberTest"> | ||
| <annotations> | ||
| <features value="Checkout"/> | ||
| <stories value="Checkout with Purchase Order Payment"/> | ||
| <title value="Create Checkout with purchase order payment method test"/> | ||
| <description value="Create Checkout with purchase order payment method"/> | ||
| <severity value="MAJOR"/> | ||
| <group value="checkout"/> | ||
| </annotations> | ||
|
|
||
| <before> | ||
| <createData entity="SimpleTwo" stepKey="createSimpleProduct"/> | ||
|
|
||
| <!-- Enable payment method --> | ||
| <magentoCLI command="config:set {{PurchaseOrderEnableConfigData.path}} {{PurchaseOrderEnableConfigData.value}}" stepKey="enablePaymentMethod"/> | ||
| </before> | ||
|
|
||
| <after> | ||
| <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/> | ||
| <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/> | ||
|
|
||
| <!-- Disable payment method --> | ||
| <magentoCLI command="config:set {{PurchaseOrderDisabledConfigData.path}} {{PurchaseOrderDisabledConfigData.value}}" stepKey="disablePaymentMethod"/> | ||
| </after> | ||
|
|
||
| <!--Go to product page--> | ||
| <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/> | ||
| <waitForPageLoad stepKey="waitForCatalogPageLoad"/> | ||
|
|
||
| <!--Add Product to Shopping Cart--> | ||
| <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"> | ||
| <argument name="productName" value="$$createSimpleProduct.name$$"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to Checkout--> | ||
| <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/> | ||
|
|
||
| <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection"> | ||
| <argument name="customerVar" value="CustomerEntityOne"/> | ||
| <argument name="customerAddressVar" value="CustomerAddressSimple"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Checkout select Purchase Order payment --> | ||
| <actionGroup ref="CheckoutSelectPurchaseOrderPaymentActionGroup" stepKey="selectPurchaseOrderPayment"> | ||
| <argument name="purchaseOrderNumber" value="12345"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Click Place Order button--> | ||
| <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/> | ||
| <waitForPageLoad stepKey="waitForPageLoad"/> | ||
|
|
||
| <!--See success messages--> | ||
| <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/> | ||
| <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order # is: " stepKey="seeOrderNumber"/> | ||
|
|
||
| </test> | ||
|
|
||
| </tests> |
Oops, something went wrong.