-
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' into eav-graphql
- Loading branch information
Showing
44 changed files
with
1,730 additions
and
5 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
69 changes: 69 additions & 0 deletions
69
...ecksIfOnlyOneQuantityConfigurationIsDisplayedForBundleProductWhileCreatingAnOrderTest.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. | ||
*/ | ||
--> | ||
<!-- Test XML Example --> | ||
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
<test name="AdminChecksIfOnlyOneQuantityConfigurationIsDisplayedForBundleProductWhileCreatingAnOrderTest"> | ||
<annotations> | ||
<features value="Bundle"/> | ||
<stories value="Create Admin checks if only one Quantity Configuration is displayed for Bundle product while creating an order"/> | ||
<title value="Admin checks if only one Quantity Configuration is displayed for Bundle product while creating an order"/> | ||
<description value="create Admin checks if only one Quantity Configuration is displayed for Bundle product "/> | ||
<severity value="MAJOR"/> | ||
<testCaseId value="AC-5237"/> | ||
</annotations> | ||
<before> | ||
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> | ||
<createData entity="SimpleProduct2" stepKey="simpleProduct1"/> | ||
<createData entity="SimpleProduct2" stepKey="simpleProduct2"/> | ||
<createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/> | ||
</before> | ||
<after> | ||
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/> | ||
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/> | ||
<!--Delete customer--> | ||
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/> | ||
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> | ||
</after> | ||
<!-- Go to bundle product creation page --> | ||
<amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/> | ||
<waitForPageLoad stepKey="waitForBundleProductCreationPage"/> | ||
<!-- Entering Bundle Product name,SKU, category, url key --> | ||
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/> | ||
<!-- Create bundle product options --> | ||
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/> | ||
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/> | ||
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/> | ||
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/> | ||
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/> | ||
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/> | ||
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/> | ||
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/> | ||
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions"> | ||
<argument name="product" value="$$simpleProduct1$$"/> | ||
</actionGroup> | ||
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/> | ||
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions2"> | ||
<argument name="product" value="$$simpleProduct2$$"/> | ||
</actionGroup> | ||
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/> | ||
<click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/> | ||
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/> | ||
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/> | ||
<!--Save the product--> | ||
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/> | ||
<!--Create new order--> | ||
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer"> | ||
<argument name="customer" value="Simple_US_Customer_NY"/> | ||
</actionGroup> | ||
<click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/> | ||
<click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearch"/> | ||
<scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/> | ||
<checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/> | ||
<waitForPageLoad stepKey="waitForProductLoad"/> | ||
</test> | ||
</tests> |
105 changes: 105 additions & 0 deletions
105
app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAPIForMultiStoresTest.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,105 @@ | ||
<?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="AdminCreateCategoryWithAPIForMultiStoresTest"> | ||
<annotations> | ||
<stories value="Create categories"/> | ||
<title value="Create Category Using API post"/> | ||
<description value="Create Category Using API post when there are more than stores existing"/> | ||
<testCaseId value="AC-5384"/> | ||
<severity value="MAJOR"/> | ||
<group value="Catalog"/> | ||
<group value="mtf_migrated"/> | ||
</annotations> | ||
|
||
<before> | ||
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/> | ||
<!--Create a new additional store view for the default website and store--> | ||
<actionGroup ref="CreateStoreViewActionGroup" stepKey="createNewSecondStoreviewForDefaultStore"> | ||
<argument name="storeView" value="SecondStoreGroupUnique"/> | ||
</actionGroup> | ||
<!--Create a new second store for the default website--> | ||
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStoreForMainWebsite"> | ||
<argument name="website" value="{{_defaultWebsite.name}}"/> | ||
<argument name="storeGroupName" value="{{customStoreGroup.name}}"/> | ||
<argument name="storeGroupCode" value="{{customStoreGroup.code}}"/> | ||
</actionGroup> | ||
<!--Create a store view for the second store--> | ||
<actionGroup ref="CreateCustomStoreViewActionGroup" stepKey="createStoreviewForSecondStore"/> | ||
<!--Create a second custom website--> | ||
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createNewWebsite"> | ||
<argument name="newWebsiteName" value="{{secondCustomWebsite.name}}"/> | ||
<argument name="websiteCode" value="{{secondCustomWebsite.code}}"/> | ||
</actionGroup> | ||
<!--Create a store for the second website--> | ||
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createStoreForNewWebsite"> | ||
<argument name="website" value="{{secondCustomWebsite.name}}"/> | ||
<argument name="storeGroupName" value="{{NewStoreData.name}}"/> | ||
<argument name="storeGroupCode" value="{{NewStoreData.code}}"/> | ||
</actionGroup> | ||
<!--Create a store view of the new store of second website--> | ||
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"> | ||
<argument name="StoreGroup" value="NewStoreData"/> | ||
<argument name="customStore" value="staticSecondStore"/> | ||
</actionGroup> | ||
</before> | ||
|
||
<after> | ||
<!--Delete the created category--> | ||
<actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteCategory"> | ||
<argument name="categoryEntity" value="SimpleSubCategory"/> | ||
</actionGroup> | ||
<!--Set the main website as default--> | ||
<actionGroup ref="AdminSetDefaultWebsiteActionGroup" stepKey="setMainWebsiteAsDefault"> | ||
<argument name="websiteName" value="{{_defaultWebsite.name}}"/> | ||
</actionGroup> | ||
<!--Delete the second created website--> | ||
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteCreatedWebsite"> | ||
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/> | ||
</actionGroup> | ||
<!--Create a second store created for main website--> | ||
<actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCreatedCustomWebsiteStore"> | ||
<argument name="storeGroupName" value="customStoreGroup.name"/> | ||
</actionGroup> | ||
<!--Create a second store view created for main website--> | ||
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCreatedCustomStoreview"> | ||
<argument name="customStore" value="SecondStoreGroupUnique"/> | ||
</actionGroup> | ||
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> | ||
</after> | ||
<!--Create a category and check that in storefront --> | ||
<createData entity="SimpleSubCategory" stepKey="createCategory"/> | ||
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/> | ||
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory"/> | ||
<see userInput="$$createCategory.name$$" stepKey="assertCategoryNameOnStorefront" selector="{{StorefrontCategoryMainSection.CategoryTitle}}"/> | ||
<waitForPageLoad stepKey="waitForCustomerCategoryPageLoad"/> | ||
<!--Switch to second store view and check that created category in storefront--> | ||
<actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToSecondMainStoreView"> | ||
<argument name="storeView" value="SecondStoreGroupUnique"/> | ||
</actionGroup> | ||
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory2"/> | ||
<see userInput="$$createCategory.name$$" stepKey="assertCategoryNameOnSecondMainStoreView" selector="{{StorefrontCategoryMainSection.CategoryTitle}}"/> | ||
<waitForPageLoad stepKey="waitForCustomerCategoryPageLoad2"/> | ||
<!--Switch to second store and check that created category in storefront--> | ||
<actionGroup ref="StorefrontSwitchStoreActionGroup" stepKey="switchToSecondMainStore"> | ||
<argument name="storeName" value="{{customStoreGroup.name}}"/> | ||
</actionGroup> | ||
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory3"/> | ||
<see userInput="$$createCategory.name$$" stepKey="assertCategoryNameOnSecondMainStore" selector="{{StorefrontCategoryMainSection.CategoryTitle}}"/> | ||
<waitForPageLoad stepKey="waitForCustomerCategoryPageLoad3"/> | ||
<!--Switch to second website and check that created category in storefront--> | ||
<actionGroup ref="AdminSetDefaultWebsiteActionGroup" stepKey="setNewWebsiteAsDefault"> | ||
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/> | ||
</actionGroup> | ||
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage2"/> | ||
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory4"/> | ||
<see userInput="$$createCategory.name$$" stepKey="assertCategoryNameOnSecondWebsite" selector="{{StorefrontCategoryMainSection.CategoryTitle}}"/> | ||
<waitForPageLoad stepKey="waitForCustomerCategoryPageLoad4"/> | ||
</test> | ||
</tests> |
Oops, something went wrong.