Skip to content

Commit 1efec0c

Browse files
author
ogorkun
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into MC-32830
2 parents c7d721b + ad08ccf commit 1efec0c

File tree

51 files changed

+826
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+826
-271
lines changed

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminAdvancedReportingButtonTest">
1111
<annotations>
12-
<stories value="AdvancedReporting"/>
13-
<title value="AdvancedReportingButtonTest"/>
14-
<description value="Test log in to AdvancedReporting and tests AdvancedReportingButtonTest"/>
15-
<testCaseId value="MC-14800"/>
16-
<skip>
17-
<issueId value="MC-14800" />
18-
</skip>
12+
<features value="Analytics"/>
13+
<stories value="Advanced Reporting"/>
14+
<title value="Assert the Advanced Reporting page is opened by dashboard link"/>
15+
<description value="Check the ability to navigate to the Advanced Reporting page through the Advanced Reporting button on the dashboard"/>
1916
<severity value="CRITICAL"/>
17+
<testCaseId value="MC-28376"/>
2018
<group value="analytics"/>
2119
<group value="mtf_migrated"/>
2220
</annotations>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@
1515
<title value="Guest customer should be able to advance search Bundle product with product sku that contains hyphen"/>
1616
<description value="Guest customer should be able to advance search Bundle product with product sku that contains hyphen"/>
1717
<severity value="MAJOR"/>
18-
<testCaseId value="MC-20359"/>
18+
<testCaseId value="MC-28812"/>
1919
<group value="Bundle"/>
2020
<group value="SearchEngineElasticsearch"/>
21-
<skip>
22-
<issueId value="MC-34217"/>
23-
</skip>
2421
</annotations>
2522
<before>
26-
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
27-
<createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
23+
<createData entity="ApiProductWithDescription" before="simple2" stepKey="simple1"/>
24+
<createData entity="ApiProductWithDescription" before="product" stepKey="simple2"/>
2825
<createData entity="ApiBundleProduct" stepKey="product"/>
2926
<createData entity="DropDownBundleOption" stepKey="bundleOption">
3027
<requiredEntity createDataKey="product"/>
@@ -42,8 +39,8 @@
4239
<magentoCron stepKey="runCronReindex" groups="index"/>
4340
</before>
4441
<after>
45-
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
46-
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
42+
<deleteData createDataKey="simple1" before="deleteSimple2" stepKey="deleteSimple1"/>
43+
<deleteData createDataKey="simple2" before="delete" stepKey="deleteSimple2"/>
4744
</after>
4845
</test>
49-
</tests>
46+
</tests>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@
1616
<features value="Catalog"/>
1717
<severity value="BLOCKER"/>
1818
<group value="mtf_migrated"/>
19-
<skip>
20-
<issueId value="MC-40816"/>
21-
</skip>
2219
</annotations>
2320
<before>
2421
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
2522
<createData entity="FirstLevelSubCat" stepKey="createDefaultCategory">
2623
<field key="is_active">true</field>
2724
</createData>
28-
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
29-
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
25+
<magentoCron groups="index" stepKey="reindex"/>
26+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
27+
<argument name="tags" value=""/>
28+
</actionGroup>
3029
</before>
3130
<after>
3231
<deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualSetEditRelatedProductsTest.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@
1515
<title value="Admin should be able to set/edit Related Products information when editing a virtual product"/>
1616
<description value="Admin should be able to set/edit Related Products information when editing a virtual product"/>
1717
<severity value="CRITICAL"/>
18-
<testCaseId value="MC-3415"/>
19-
<group value="Catalog"/>
20-
<skip>
21-
<issueId value="MC-194"/>
22-
</skip>
18+
<testCaseId value="MC-25532"/>
19+
<group value="catalog"/>
2320
</annotations>
24-
<before></before>
2521
<after>
2622
<!-- Delete virtual product -->
2723
<actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
@@ -38,6 +34,6 @@
3834
</actionGroup>
3935

4036
<!--See related product in storefront-->
41-
<amOnPage url="{{defaultVirtualProduct.urlKey}}.html" stepKey="goToStorefront"/>
37+
<amOnPage url="{{StorefrontProductPage.url(defaultVirtualProduct.urlKey)}}" stepKey="goToStorefront"/>
4238
</test>
4339
</tests>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
<title value="Guest customer should be able to advance search simple product with product sku that contains hyphen"/>
1616
<description value="Guest customer should be able to advance search simple product with product sku that contains hyphen"/>
1717
<severity value="MAJOR"/>
18-
<testCaseId value="MC-20361"/>
18+
<testCaseId value="MC-28813"/>
1919
<group value="Catalog"/>
2020
<group value="SearchEngineElasticsearch"/>
21-
<skip>
22-
<issueId value="MC-34217"/>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<createData entity="ApiProductWithDescription" stepKey="product"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
<title value="Guest customer should be able to advance search virtual product with product sku that contains hyphen"/>
1616
<description value="Guest customer should be able to advance search virtual product with product sku that contains hyphen"/>
1717
<severity value="MAJOR"/>
18-
<testCaseId value="MC-20385"/>
19-
<group value="Catalog"/>
18+
<testCaseId value="MC-28816"/>
19+
<group value="catalog"/>
2020
<group value="SearchEngineElasticsearch"/>
21-
<skip>
22-
<issueId value="MC-34217"/>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<createData entity="ApiVirtualProductWithDescription" stepKey="product"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,11 @@
1212
<annotations>
1313
<features value="Catalog"/>
1414
<stories value="Custom options"/>
15-
<group value="Catalog"/>
1615
<title value="Admin should be able to see the full title of the selected custom option value in the order"/>
1716
<description value="Admin should be able to see the full title of the selected custom option value in the order"/>
1817
<severity value="MAJOR"/>
19-
<testCaseId value="MC-3043"/>
20-
<skip>
21-
<issueId value="MQE-1128"/>
22-
</skip>
18+
<testCaseId value="MC-25479"/>
19+
<group value="catalog"/>
2320
</annotations>
2421
<before>
2522
<!--Create Simple Product with Custom Options-->
@@ -45,46 +42,47 @@
4542
<!-- Login Customer Storefront -->
4643
<actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
4744
<actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormWithCorrectCredentials">
48-
<argument name="customer" value="$$createCustomer$$"/>
45+
<argument name="customer" value="$createCustomer$"/>
4946
</actionGroup>
5047
<actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButton" />
5148

5249
<!-- Checking the correctness of displayed prices for user parameters -->
5350

54-
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProductPage"/>
51+
<amOnPage url="{{StorefrontProductPage.url($createProduct.custom_attributes[url_key]$)}}" stepKey="amOnProductPage"/>
52+
<waitForPageLoad stepKey="waitForPageLoad"/>
5553
<seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsDropDown(ProductOptionDropDownWithLongValuesTitle.title, ProductOptionValueDropdownLongTitle1.price)}}" stepKey="checkDropDownProductOption"/>
5654

5755
<!-- Adding items to the checkout -->
5856

5957
<selectOption userInput="{{ProductOptionValueDropdownLongTitle1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionDropDownWithLongValuesTitle.title)}}" stepKey="seeProductOptionDropDown"/>
60-
<grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="finalProductPrice"/>
61-
58+
<comment userInput="BIC workaround" stepKey="finalProductPrice"/>
6259
<actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
63-
<argument name="productName" value="$$createProduct.name$$"/>
60+
<argument name="productName" value="$createProduct.name$"/>
6461
</actionGroup>
6562

6663
<!-- Checking the correctness of displayed custom options for user parameters on checkout -->
6764

6865
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
6966

70-
<conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
67+
<waitForElementVisible selector="{{CheckoutPaymentSection.cartItemsArea}}" stepKey="waitForCartItemsVisible"/>
68+
<conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsAreaActive}}" visible="false" stepKey="exposeMiniCart"/>
7169

7270
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
73-
<waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
71+
<waitForElementVisible selector="{{CheckoutPaymentSection.cartItems}}" stepKey="waitForCartItemsAreaActive"/>
7472

75-
<see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
73+
<see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$createProduct.name$" stepKey="seeProductInCart"/>
7674

77-
<conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
75+
<conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($createProduct.name$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" visible="false" stepKey="exposeProductOptions"/>
7876

79-
<see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
77+
<see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
8078

8179
<!--Select shipping method-->
8280

8381
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
8482
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
8583

8684
<!-- Checkout select Check/Money Order payment -->
87-
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
85+
<comment userInput="BIC workaround" stepKey="selectCheckMoneyPayment"/>
8886

8987
<!-- Place Order -->
9088

@@ -116,6 +114,6 @@
116114
</assertEquals>
117115
<moveMouseOver selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="hoverProduct"/>
118116
<waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd:nth-child(2)" stepKey="waitForCustomOptionValueFullName"/>
119-
<see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
117+
<see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 11Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
120118
</test>
121119
</tests>

‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontFillFormAdvancedSearchActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ShortDescription}}" userInput="{{short_description}}" stepKey="fillShortDescription"/>
2424
<fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFrom}}" userInput="{{price_from}}" stepKey="fillPriceFrom"/>
2525
<fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceTo}}" userInput="{{price_to}}" stepKey="fillPriceTo"/>
26+
<scrollTo selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="scrollToSubmitButton"/>
2627
<click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
2728
<waitForPageLoad stepKey="waitForPageLoad"/>
2829
</actionGroup>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<argument name="shippingMethod" defaultValue="" type="string"/>
2020
</arguments>
2121

22+
<waitForElementVisible selector="{{CheckoutShippingSection.email}}" stepKey="waitForEmailField"/>
2223
<fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
2324
<fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
2425
<fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
99
<section name="CheckoutHeaderSection">
10-
<element name="shippingMethodStep" type="text" selector=".opc-progress-bar-item:nth-of-type(1)"/>
10+
<element name="shippingMethodStep" type="text" selector=".opc-progress-bar-item:nth-of-type(1)" timeout="30"/>
1111
<element name="reviewAndPaymentsStep" type="text" selector=".opc-progress-bar-item:nth-of-type(2)"/>
1212
<element name="errorMessageContainsText" type="text" selector="//div[contains(@class, 'message message-error error')]//div[contains(text(), '{{text}}')]" parameterized="true"/>
1313
</section>

0 commit comments

Comments
 (0)