-
Notifications
You must be signed in to change notification settings - Fork 9.4k
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' into add-AdminClickInvoiceButtonIntoOrderA…
…ctionGroup
- Loading branch information
Showing
228 changed files
with
10,103 additions
and
834 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
94 changes: 94 additions & 0 deletions
94
...agento/Bundle/Test/Mftf/Test/StorefrontBundlePlaceOrderWithMultipleOptionsSuccessTest.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,94 @@ | ||
| <?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="StorefrontBundlePlaceOrderWithMultipleOptionsSuccessTest"> | ||
| <annotations> | ||
| <features value="Bundle"/> | ||
| <stories value="Bundle product details page"/> | ||
| <title value="Customer should be able to see all the bundle items in invoice view"/> | ||
| <description value="Customer should be able to see all the bundle items in invoice view"/> | ||
| <severity value="MAJOR"/> | ||
| <testCaseId value="MC-37515"/> | ||
| <group value="Bundle"/> | ||
| </annotations> | ||
| <before> | ||
| <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> | ||
| <createData entity="SimpleProduct2" stepKey="firstSimpleProduct"/> | ||
| <createData entity="SimpleProduct2" stepKey="secondSimpleProduct"/> | ||
| <createData entity="CustomerEntityOne" stepKey="createCustomer"/> | ||
| <actionGroup stepKey="loginToAdminPanel" ref="AdminLoginActionGroup"/> | ||
| </before> | ||
| <after> | ||
| <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> | ||
| <deleteData createDataKey="firstSimpleProduct" stepKey="deleteFirstSimpleProduct"/> | ||
| <deleteData createDataKey="secondSimpleProduct" stepKey="deleteSecondSimpleProduct"/> | ||
| <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/> | ||
| <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> | ||
| </after> | ||
| <!-- Create new bundle product --> | ||
| <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createBundleProduct"> | ||
| <argument name="productType" value="bundle"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Fill all main fields --> | ||
| <actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainProductFields"/> | ||
|
|
||
| <!-- Add first bundle option to the product --> | ||
| <actionGroup ref="AddBundleOptionWithTwoProductsActionGroup" stepKey="addFirstBundleOption"> | ||
| <argument name="x" value="0"/> | ||
| <argument name="n" value="1"/> | ||
| <argument name="prodOneSku" value="$firstSimpleProduct.sku$"/> | ||
| <argument name="prodTwoSku" value="$secondSimpleProduct.sku$$"/> | ||
| <argument name="optionTitle" value="{{CheckboxOption.title}}"/> | ||
| <argument name="inputType" value="{{CheckboxOption.type}}"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Save product form --> | ||
| <actionGroup ref="SaveProductFormActionGroup" stepKey="saveWithThreeOptions"/> | ||
|
|
||
| <!--Login customer on storefront--> | ||
| <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer"> | ||
| <argument name="Customer" value="$$createCustomer$$" /> | ||
| </actionGroup> | ||
|
|
||
| <!--Open Product Page--> | ||
| <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage"> | ||
| <argument name="productUrl" value="{{BundleProduct.name}}"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Add bundle to cart --> | ||
| <actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickAddToCart"> | ||
| <argument name="productUrl" value="{{BundleProduct.name}}"/> | ||
| </actionGroup> | ||
| <checkOption selector="{{StorefrontBundledSection.checkboxOptionThreeProducts(CheckboxOption.title, '1')}}" stepKey="selectOption2Product1"/> | ||
| <checkOption selector="{{StorefrontBundledSection.checkboxOptionThreeProducts(CheckboxOption.title, '2')}}" stepKey="selectOption2Product2"/> | ||
| <actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart"> | ||
| <argument name="quantity" value="1"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Navigate to checkout--> | ||
| <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/> | ||
| <!-- Click next button to open payment section --> | ||
| <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/> | ||
| <!-- Click place order --> | ||
| <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/> | ||
| <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/> | ||
|
|
||
| <!-- Order review page has address that was created during checkout --> | ||
| <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById"> | ||
| <argument name="orderId" value="{$grabOrderNumber}"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Open create invoice page --> | ||
| <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startInvoice"/> | ||
|
|
||
| <!-- Assert item options display --> | ||
| <see selector="{{AdminInvoiceItemsSection.bundleItem}}" userInput="50 x $firstSimpleProduct.sku$" stepKey="seeFirstProductInList"/> | ||
| <see selector="{{AdminInvoiceItemsSection.bundleItem}}" userInput="50 x $secondSimpleProduct.sku$" stepKey="seeSecondProductInList"/> | ||
| </test> | ||
| </tests> |
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
22 changes: 22 additions & 0 deletions
22
...atalogWidget/Test/Mftf/ActionGroup/AdminFillCatalogProductsListWidgetTitleActionGroup.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,22 @@ | ||
| <?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="AdminFillCatalogProductsListWidgetTitleActionGroup"> | ||
| <annotations> | ||
| <description>Fill catalog products list title field.</description> | ||
| </annotations> | ||
|
|
||
| <arguments> | ||
| <argument name="title" type="string" defaultValue=""/> | ||
| </arguments> | ||
| <waitForElementVisible selector="{{InsertWidgetSection.title}}" stepKey="waitForField"/> | ||
| <fillField selector="{{InsertWidgetSection.title}}" userInput="{{title}}" stepKey="fillTitleField"/> | ||
| </actionGroup> | ||
| </actionGroups> |
26 changes: 26 additions & 0 deletions
26
...de/Magento/CatalogWidget/Test/Mftf/ActionGroup/StorefrontAssertWidgetTitleActionGroup.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="StorefrontAssertWidgetTitleActionGroup"> | ||
| <annotations> | ||
| <description>Assert widget title on storefront.</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="title" type="string"/> | ||
| </arguments> | ||
|
|
||
| <grabTextFrom selector="{{StorefrontWidgetsSection.widgetProductsGrid}} {{StorefrontWidgetsSection.widgetTitle}}" | ||
| stepKey="grabWidgetTitle"/> | ||
| <assertEquals stepKey="assertWidgetTitle"> | ||
| <actualResult type="string">$grabWidgetTitle</actualResult> | ||
| <expectedResult type="string">{{title}}</expectedResult> | ||
| </assertEquals> | ||
| </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
90 changes: 90 additions & 0 deletions
90
...f/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutWithCustomerGroupTest.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,90 @@ | ||
| <?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="StorefrontCustomerCheckoutWithCustomerGroupTest"> | ||
| <annotations> | ||
| <features value="Customer Checkout"/> | ||
| <stories value="Customer checkout with Customer Group assigned"/> | ||
| <title value="Place order by Customer with Customer Group assigned"/> | ||
| <description value="Customer Group should be assigned to Order when setting Auto Group Assign is enabled for Customer"/> | ||
| <testCaseId value="MC-37259"/> | ||
| <severity value="MAJOR"/> | ||
| <group value="checkout"/> | ||
| <group value="customer"/> | ||
| </annotations> | ||
| <before> | ||
|
|
||
| <magentoCLI command="config:set customer/create_account/auto_group_assign 1" stepKey="enableAutoGroupAssign"/> | ||
|
|
||
| <createData entity="SimpleSubCategory" stepKey="createCategory"/> | ||
| <createData entity="SimpleProduct" stepKey="createSimpleProduct"> | ||
| <requiredEntity createDataKey="createCategory"/> | ||
| </createData> | ||
|
|
||
| <createData entity="Simple_US_Customer" stepKey="createCustomer"/> | ||
|
|
||
| <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> | ||
|
|
||
| <actionGroup ref="AdminUpdateCustomerGroupByEmailActionGroup" stepKey="updateCustomerGroup"> | ||
| <argument name="emailAddress" value="$$createCustomer.email$$"/> | ||
| <argument name="customerGroup" value="Retail"/> | ||
| </actionGroup> | ||
|
|
||
| </before> | ||
| <after> | ||
| <magentoCLI command="config:set customer/create_account/auto_group_assign 0" stepKey="disableAutoGroupAssign"/> | ||
|
|
||
| <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/> | ||
| <deleteData createDataKey="createCustomer" stepKey="deleteUsCustomer"/> | ||
| <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="resetCustomerFilters"/> | ||
| <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/> | ||
| <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/> | ||
| <deleteData createDataKey="createCategory" stepKey="deleteSimpleCategory"/> | ||
| </after> | ||
|
|
||
| <actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomerLogin"> | ||
| <argument name="Customer" value="$$createCustomer$$"/> | ||
| </actionGroup> | ||
|
|
||
| <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage"> | ||
| <argument name="category" value="$$createCategory$$"/> | ||
| </actionGroup> | ||
|
|
||
| <waitForPageLoad stepKey="waitForCatalogPageLoad"/> | ||
|
|
||
| <actionGroup ref="StorefrontAddCategoryProductToCartActionGroup" stepKey="addProductToCart"> | ||
| <argument name="product" value="$$createSimpleProduct$$"/> | ||
| <argument name="productCount" value="CONST.one"/> | ||
| </actionGroup> | ||
|
|
||
| <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/> | ||
| <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/> | ||
| <actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/> | ||
| <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/> | ||
| <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"> | ||
| <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/> | ||
| <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/> | ||
| </actionGroup> | ||
|
|
||
| <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="orderNumber"/> | ||
|
|
||
| <actionGroup ref="OpenOrderByIdActionGroup" stepKey="addFilterToGridAndOpenOrder"> | ||
| <argument name="orderId" value="{$orderNumber}"/> | ||
| </actionGroup> | ||
|
|
||
| <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="verifyOrderStatus"/> | ||
| <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Customer" stepKey="verifyAccountInformation"/> | ||
| <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="$$createCustomer.email$$" stepKey="verifyCustomerEmail"/> | ||
| <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Retail" stepKey="verifyCustomerGroup"/> | ||
| <see selector="{{AdminOrderDetailsInformationSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" stepKey="verifyBillingAddress"/> | ||
| <see selector="{{AdminOrderDetailsInformationSection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}}" stepKey="verifyShippingAddress"/> | ||
| <see selector="{{AdminOrderDetailsInformationSection.itemsOrdered}}" userInput="$$createSimpleProduct.name$$" stepKey="verifyProductName"/> | ||
|
|
||
| </test> | ||
| </tests> |
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
Oops, something went wrong.