-
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 pull request #3645 from magento-epam/EPAM-PR-34
Fixed: MAGETWO-58212 [GITHUB] Magento 2.1 CE, Cannot change attribute set for bundled product #5999 MAGETWO-96842 [2.3.x] [Magento Cloud] [QUANS] Tiered block displayed on configurable products without any tiered pricing MAGETWO-96412 [2.3.x] Not possible to drag specified Related/Upsell/Cross-sell products to new positions in Windows 10 machine MAGETWO-96847 [2.3.x] Special price does not work when "default config" scope timezone does not match "website" scope timezone MAGETWO-96424 [2.3.x] [Magento Cloud] Requesition list qty of configurable product variation not updated individually MAGETWO-91589 Slow query delete on sub SELECT query MAGETWO-82221 [CE 2.1.0 rc3] - Cancel an order [configurable product] #5313 MAGETWO-92226 Product export creates 2 rows for Simple product with custom options MAGETWO-60910 Session initialized during reindex from CLI and result fatal error MAGETWO-97260 creating new shipment: gettting all trackers. after this commit 2307e16 MAGETWO-96342 MySQL connection issue MAGETWO-97434 MFTF test cases have parsing error MAGETWO-91513 Password reset email cannot be sent if the customer does not have customer attribute set that is changed to required after original account creation MAGETWO-95802 [EE] Admin date wrong formatting for French locale
- Loading branch information
Showing
53 changed files
with
1,242 additions
and
254 deletions.
There are no files selected for viewing
24 changes: 24 additions & 0 deletions
24
app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.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,24 @@ | ||
<?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="SetAdminAccountActionGroup"> | ||
<arguments> | ||
<argument name="InterfaceLocaleByValue" type="string"/> | ||
</arguments> | ||
<!-- Navigate to admin System Account Page--> | ||
<amOnPage url="{{AdminSystemAccountPage.url}}" stepKey="openAdminSystemAccountPage" /> | ||
<waitForPageLoad stepKey="loadAdminSystemAccountPage"/> | ||
<!-- Change Admin locale to Français (France) / French (France) --> | ||
<selectOption userInput="{{InterfaceLocaleByValue}}" selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="setInterfaceLocate"/> | ||
<fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/> | ||
<click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="clickSave"/> | ||
<waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/> | ||
</actionGroup> | ||
</actionGroups> |
14 changes: 14 additions & 0 deletions
14
app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.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,14 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
--> | ||
|
||
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd"> | ||
<page name="AdminSystemAccountPage" url="admin/system_account/index/" area="admin" module="Magento_Backend"> | ||
<section name="AdminSystemAccountSection"/> | ||
</page> | ||
</pages> |
15 changes: 15 additions & 0 deletions
15
app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.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,15 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
--> | ||
|
||
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> | ||
<section name="AdminSystemAccountSection"> | ||
<element name="interfaceLocale" type="text" selector="#interface_locale"/> | ||
<element name="currentPassword" type="text" selector="#current_password"/> | ||
</section> | ||
</sections> |
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
94 changes: 94 additions & 0 deletions
94
...atalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.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="AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest"> | ||
<annotations> | ||
<features value="Catalog"/> | ||
<title value="Check that 'trie price' block not available for simple product from options without 'trie price'"/> | ||
<description value="Check that 'trie price' block not available for simple product from options without 'trie price'"/> | ||
<severity value="MAJOR"/> | ||
<testCaseId value="MAGETWO-97050"/> | ||
<useCaseId value="MAGETWO-96842"/> | ||
<group value="catalog"/> | ||
</annotations> | ||
<before> | ||
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> | ||
|
||
<!--Create category--> | ||
<createData entity="SimpleSubCategory" stepKey="createCategory"/> | ||
|
||
<!-- Create the configurable product based on the data in the /data folder --> | ||
<createData entity="ApiConfigurableProduct" stepKey="createConfigProduct"> | ||
<requiredEntity createDataKey="createCategory"/> | ||
</createData> | ||
|
||
<!-- Make the configurable product have two options, that are children of the default attribute set --> | ||
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/> | ||
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1"> | ||
<requiredEntity createDataKey="createConfigProductAttribute"/> | ||
</createData> | ||
<createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2"> | ||
<requiredEntity createDataKey="createConfigProductAttribute"/> | ||
</createData> | ||
<createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet"> | ||
<requiredEntity createDataKey="createConfigProductAttribute"/> | ||
</createData> | ||
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1"> | ||
<requiredEntity createDataKey="createConfigProductAttribute"/> | ||
</getData> | ||
<getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2"> | ||
<requiredEntity createDataKey="createConfigProductAttribute"/> | ||
</getData> | ||
|
||
<!-- Create the 2 children that will be a part of the configurable product --> | ||
<createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1"> | ||
<requiredEntity createDataKey="createConfigProductAttribute"/> | ||
<requiredEntity createDataKey="getConfigAttributeOption1"/> | ||
</createData> | ||
<createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2"> | ||
<requiredEntity createDataKey="createConfigProductAttribute"/> | ||
<requiredEntity createDataKey="getConfigAttributeOption2"/> | ||
</createData> | ||
|
||
<!-- Assign the two products to the configurable product --> | ||
<createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption"> | ||
<requiredEntity createDataKey="createConfigProduct"/> | ||
<requiredEntity createDataKey="createConfigProductAttribute"/> | ||
<requiredEntity createDataKey="getConfigAttributeOption1"/> | ||
<requiredEntity createDataKey="getConfigAttributeOption2"/> | ||
</createData> | ||
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1"> | ||
<requiredEntity createDataKey="createConfigProduct"/> | ||
<requiredEntity createDataKey="createConfigChildProduct1"/> | ||
</createData> | ||
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2"> | ||
<requiredEntity createDataKey="createConfigProduct"/> | ||
<requiredEntity createDataKey="createConfigChildProduct2"/> | ||
</createData> | ||
</before> | ||
<after> | ||
<!--Delete created data--> | ||
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/> | ||
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/> | ||
<deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/> | ||
<deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/> | ||
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/> | ||
|
||
<actionGroup ref="logout" stepKey="logoutOfAdmin"/> | ||
</after> | ||
|
||
<!--Go to storefront product page an check price box css--> | ||
<amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/> | ||
<waitForPageLoad stepKey="waitForStoreFrontLoad"/> | ||
<selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1.value$$" stepKey="selectOption"/> | ||
<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="class" stepKey="grabGrabPriceClass"/> | ||
<assertNotContains actual="$grabGrabPriceClass" expected=".price-box .price-tier_price" expectedType="string" stepKey="assertNotEquals"/> | ||
</test> | ||
</tests> |
Oops, something went wrong.