forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
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 magento#3671 from magento-epam/EPAM-PR-35
Fixed: MAGETWO-64191 [GITHUB] Url rewrite for product is broken after using massaction magento#8227 MAGETWO-96411 [2.3.x] Default addresses not selected when checking out from cart MAGETWO-96849 [2.3.x] Money are refunded to gift card during partial refund when it's not required MAGETWO-96846 [2.3.x] Anchor categories are not showing products after enabling subcategories MC-5573 Refactoring tests. Improve specified test cases. MC-10934 Tests failures CreationScheduledUpdateForStagingDashboardTest and StorefrontPurchaseProductWithCustomOptions MAGETWO-91676 related data missing in order rest api
- Loading branch information
Showing
37 changed files
with
367 additions
and
182 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
173 changes: 86 additions & 87 deletions
173
app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.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 |
|---|---|---|
| @@ -1,87 +1,86 @@ | ||
| <?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="CheckoutSpecificDestinationsTest"> | ||
| <annotations> | ||
| <title value="Check that top destinations can be removed after a selection was previously saved"/> | ||
| <stories value="MAGETWO-91511: Top destinations cannot be removed after a selection was previously saved"/> | ||
| <description value="Check that top destinations can be removed after a selection was previously saved"/> | ||
| <features value="Checkout"/> | ||
| <severity value="AVERAGE"/> | ||
| <testCaseId value="MAGETWO-94195"/> | ||
| <group value="Checkout"/> | ||
| </annotations> | ||
|
|
||
| <before> | ||
| <createData entity="_defaultCategory" stepKey="defaultCategory"/> | ||
| <createData entity="_defaultProduct" stepKey="simpleProduct"> | ||
| <requiredEntity createDataKey="defaultCategory"/> | ||
| </createData> | ||
|
|
||
| <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> | ||
| </before> | ||
|
|
||
| <!--Go to configuration general page--> | ||
| <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage"/> | ||
|
|
||
| <!--Open country options section--> | ||
| <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation"/> | ||
|
|
||
| <!--Select top destinations country--> | ||
| <actionGroup ref="SelectTopDestinationsCountry" stepKey="selectTopDestinationsCountry"> | ||
| <argument name="countries" value="Countries"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to product page--> | ||
| <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.name$$)}}" stepKey="amOnStorefrontProductPage"/> | ||
| <waitForPageLoad stepKey="waitForProductPageLoad"/> | ||
|
|
||
| <!--Add product to cart--> | ||
| <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCart"> | ||
| <argument name="productName" value="$$simpleProduct.name$$"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to shopping cart--> | ||
| <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/> | ||
|
|
||
| <!--Verify country options in checkout top destination section--> | ||
| <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry"> | ||
| <argument name="country" value="Bahamas"/> | ||
| <argument name="placeNumber" value="2"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to configuration general page--> | ||
| <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage2"/> | ||
|
|
||
| <!--Open country options section--> | ||
| <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation2"/> | ||
|
|
||
| <!--Deselect top destinations country--> | ||
| <actionGroup ref="UnSelectTopDestinationsCountry" stepKey="unSelectTopDestinationsCountry"> | ||
| <argument name="countries" value="Countries"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to shopping cart--> | ||
| <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart2"/> | ||
|
|
||
| <!--Verify country options is shown by default--> | ||
| <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry2"> | ||
| <argument name="country" value="Afghanistan"/> | ||
| <argument name="placeNumber" value="2"/> | ||
| </actionGroup> | ||
|
|
||
| <after> | ||
| <actionGroup ref="logout" stepKey="logout"/> | ||
|
|
||
| <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/> | ||
| <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/> | ||
| </after> | ||
| </test> | ||
| </tests> | ||
| <?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="CheckoutSpecificDestinationsTest"> | ||
| <annotations> | ||
| <title value="Check that top destinations can be removed after a selection was previously saved"/> | ||
| <stories value="MAGETWO-91511: Top destinations cannot be removed after a selection was previously saved"/> | ||
| <description value="Check that top destinations can be removed after a selection was previously saved"/> | ||
| <features value="Checkout"/> | ||
| <severity value="AVERAGE"/> | ||
| <testCaseId value="MAGETWO-94195"/> | ||
| <group value="Checkout"/> | ||
| </annotations> | ||
|
|
||
| <before> | ||
| <createData entity="_defaultCategory" stepKey="defaultCategory"/> | ||
| <createData entity="_defaultProduct" stepKey="simpleProduct"> | ||
| <requiredEntity createDataKey="defaultCategory"/> | ||
| </createData> | ||
|
|
||
| <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> | ||
| </before> | ||
|
|
||
| <!--Go to configuration general page--> | ||
| <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage"/> | ||
|
|
||
| <!--Open country options section--> | ||
| <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation"/> | ||
|
|
||
| <!--Select top destinations country--> | ||
| <actionGroup ref="SelectTopDestinationsCountry" stepKey="selectTopDestinationsCountry"> | ||
| <argument name="countries" value="Countries"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to product page--> | ||
| <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.name$$)}}" stepKey="amOnStorefrontProductPage"/> | ||
| <waitForPageLoad stepKey="waitForProductPageLoad"/> | ||
|
|
||
| <!--Add product to cart--> | ||
| <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCart"> | ||
| <argument name="productName" value="$$simpleProduct.name$$"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to shopping cart--> | ||
| <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/> | ||
|
|
||
| <!--Verify country options in checkout top destination section--> | ||
| <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry"> | ||
| <argument name="country" value="Bahamas"/> | ||
| <argument name="placeNumber" value="2"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to configuration general page--> | ||
| <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage2"/> | ||
|
|
||
| <!--Open country options section--> | ||
| <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation2"/> | ||
|
|
||
| <!--Deselect top destinations country--> | ||
| <actionGroup ref="UnSelectTopDestinationsCountry" stepKey="unSelectTopDestinationsCountry"> | ||
| <argument name="countries" value="Countries"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Go to shopping cart--> | ||
| <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart2"/> | ||
|
|
||
| <!--Verify country options is shown by default--> | ||
| <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry2"> | ||
| <argument name="country" value="Afghanistan"/> | ||
| <argument name="placeNumber" value="2"/> | ||
| </actionGroup> | ||
|
|
||
| <after> | ||
| <actionGroup ref="logout" stepKey="logout"/> | ||
|
|
||
| <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/> | ||
| <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/> | ||
| </after> | ||
| </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
27 changes: 27 additions & 0 deletions
27
app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShopingCartActionGroup.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,27 @@ | ||
| <?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="AdminAddProductToShoppingCartActionGroup"> | ||
| <arguments> | ||
| <argument name="productName" type="string"/> | ||
| </arguments> | ||
| <waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.productItem}}" stepKey="waitForElementVisible"/> | ||
| <click selector="{{AdminCustomerShoppingCartProductItemSection.productItem}}" stepKey="expandProductItem"/> | ||
| <waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.productNameFilter}}" stepKey="waitForProductFilterFieldVisible"/> | ||
| <fillField selector="{{AdminCustomerShoppingCartProductItemSection.productNameFilter}}" stepKey="setProductName" userInput="{{productName}}"/> | ||
| <click selector="{{AdminCustomerShoppingCartProductItemSection.searchButton}}" stepKey="clickSearchButton"/> | ||
| <waitForAjaxLoad stepKey="waitForAjax"/> | ||
| <waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.firstProductCheckbox}}" stepKey="waitForElementCheckboxVisible"/> | ||
| <click selector="{{AdminCustomerShoppingCartProductItemSection.firstProductCheckbox}}" stepKey="selectFirstCheckbox"/> | ||
| <click selector="{{AdminCustomerShoppingCartProductItemSection.addSelectionsToMyCartButton}}" stepKey="clickAddSelectionsToMyCartButton" after="selectFirstCheckbox"/> | ||
| <waitForAjaxLoad stepKey="waitForAjax2"/> | ||
| <seeElement stepKey="seeAddedProduct" selector="{{AdminCustomerShoppingCartProductItemSection.addedProductName('productName')}}"/> | ||
| </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
23 changes: 23 additions & 0 deletions
23
app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.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,23 @@ | ||
| <?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="AdminCustomerShoppingCartSection"> | ||
| <element name="createOrderButton" type="button" selector="button[title='Create Order']"/> | ||
| </section> | ||
|
|
||
| <section name="AdminCustomerShoppingCartProductItemSection"> | ||
| <element name="productItem" type="button" selector="#dt-products"/> | ||
| <element name="productNameFilter" type="input" selector="#source_products_filter_name"/> | ||
| <element name="searchButton" type="button" selector="//*[@id='anchor-content']//button[@title='Search']"/> | ||
| <element name="firstProductCheckbox" type="checkbox" selector="//*[@id='source_products_table']/tbody/tr[1]//*[@name='source_products']"/> | ||
| <element name="addSelectionsToMyCartButton" type="button" selector="//*[@id='products_search']/div[1]//*[text()='Add selections to my cart']"/> | ||
| <element name="addedProductName" type="text" selector="//*[@id='order-items_grid']//*[text()='{{var}}']" parameterized="true"/> | ||
| </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
Oops, something went wrong.