Skip to content

Commit c8ff030

Browse files
Karishmathakare19Karishmathakare19
authored
Merge pull request #10090 from magento-gl/ACQE-functional-deployment-version15
Bengals Functional Mainline deployment
2 parents bd4aabb + 550c2a3 commit c8ff030

20 files changed

+636
-130
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundleProductActionSection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<element name="dropdownSelectOption" type="select" selector="//div[@class='control']/select"/>
1515
<element name="dropdownProductSelection" type="select" selector="//div[@class='control']/select/option[contains(.,'{{productName}}')]" parameterized="true"/>
1616
<element name="customOptionField" type="select" selector="[class='input-text product-custom-option']"/>
17-
<element name="bundleOption" type="text" selector="//select[contains(@class, 'bundle-option')]/option[contains(text(),'{{productName}}')]" parameterized="true"/>
17+
<element name="bundleOption" type="text" selector="//span[@class='product-name' and text()='{{productName}}']" parameterized="true"/>
1818
<element name="updateWishList" type="button" selector="a.action.towishlist.updated" timeout="30"/>
1919
<element name="skuField" type="input" selector=".product.attribute.sku"/>
2020
</section>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddToCartFromStorefrontProductPageActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</arguments>
1919
<waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartDisabled}}" stepKey="waitForAddToCartButtonToRemoveDisabledState"/>
2020
<!-- Scroll to button to prevent overlapping elements from intercepting click -->
21-
<scrollTo selector="{{StorefrontProductActionSection.addToCart}}" stepKey="scrollToAddToCartButton"/>
21+
<scrollToTopOfPage stepKey="scrollToAddToCartButton"/>
2222
<waitForElementClickable selector="{{StorefrontProductActionSection.addToCart}}" stepKey="waitForAddToCartButton"/>
2323
<click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
2424
<waitForPageLoad stepKey="waitForAddToCart"/>

‎app/code/Magento/Catalog/Test/Mftf/Data/SeoConfigData.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,18 @@
2020
<data key="label">No</data>
2121
<data key="value">0</data>
2222
</entity>
23+
<entity name="CategoriesUrlSuffix">
24+
<data key="path">catalog/seo/category_url_suffix</data>
25+
<data key="label">''</data>
26+
<data key="value">.html</data>
27+
</entity>
28+
<entity name="ProductsUrlSuffix">
29+
<data key="path">catalog/seo/product_url_suffix</data>
30+
<data key="label">''</data>
31+
<data key="value">.html</data>
32+
</entity>
33+
<entity name="CategoryClassStatus">
34+
<data key="scope">active</data>
35+
<data key="value">has-active</data>
36+
</entity>
2337
</entities>

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

Lines changed: 252 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontCategoryNavigationHighlightingWithStoreCodeTest" extends="StorefrontCategoryNavigationHighlightingTest">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<stories value="Category Navigation Highlighting with Store Code in URLs"/>
15+
<title value="Verify category highlighting in navigation with store code in URLs and no URL suffixes"/>
16+
<description value="Correct category should be highlighted in the navigation menu when navigating through categories and products on the storefront based on store code"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="AC-10854"/>
19+
<group value="Catalog"/>
20+
</annotations>
21+
<before>
22+
<remove keyForRemoval="enableUseCategoriesPathForProductUrlsDefault"/>
23+
<!-- Precondition Step 2: Set configuration: Add Store Code to Urls: Yes -->
24+
<magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="enableStoreCodeInUrl" after="clickSaveButton"/>
25+
<!-- Set configuration: Remove category URL suffix -->
26+
<magentoCLI command="config:set {{CategoriesUrlSuffix.path}} {{CategoriesUrlSuffix.label}}" stepKey="setCategoryUrlSuffixEmpty" after="enableStoreCodeInUrl"/>
27+
<!-- Set configuration: Remove product URL suffix -->
28+
<magentoCLI command="config:set {{ProductsUrlSuffix.path}} {{ProductsUrlSuffix.label}}" stepKey="setProductUrlSuffixEmpty" after="setCategoryUrlSuffixEmpty"/>
29+
</before>
30+
<after>
31+
<!-- Reset configuration: Restore store code URL -->
32+
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
33+
<!-- Reset configuration: Restore default category URL suffix -->
34+
<magentoCLI command="config:set {{CategoriesUrlSuffix.path}} {{CategoriesUrlSuffix.value}}" stepKey="resetCategoryUrlSuffixAsDefault"/>
35+
<!-- Reset configuration: Restore default product URL suffix -->
36+
<magentoCLI command="config:set {{ProductsUrlSuffix.path}} {{ProductsUrlSuffix.value}}" stepKey="resetProductUrlSuffixAsDefault"/>
37+
</after>
38+
<remove keyForRemoval="navigateToCategoryStorefront"/>
39+
<!-- Step 7: Open direct Category 1.2 url -> Check that Cat 1.2 is highlighted & parent Cat 1 is also highlighted -->
40+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCategoryPageStorefront" after="assertParentCategoryHasActiveChild_Try4">
41+
<argument name="page" value="/default/$$createCat1.custom_attributes[url_key]$$/$$createCat12.custom_attributes[url_key]$$"/>
42+
</actionGroup>
43+
<remove keyForRemoval="navigateToProductStorefront"/>
44+
<!-- Step 9: Open Product 1.1-1.2 direct url with category & store in it -> Check that only categories Cat 1 & Cat 1.2 are highlighted -->
45+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToProductPageStorefront" after="assertParentCategoryHasActiveChild_Try6">
46+
<argument name="page" value="/default/$$createCat1.custom_attributes[url_key]$$/$$createCat12.custom_attributes[url_key]$$/$$createProduct1112.custom_attributes[url_key]$$"/>
47+
</actionGroup>
48+
</test>
49+
</tests>

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontCategoryPathWithStoreCodeNoSuffixTest" extends="StorefrontCategoryNavigationHighlightingTest">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<stories value="Category Navigation Highlighting with Store Code in URLs"/>
15+
<title value="Category highlighting in navigation with store code in URLs and URL suffixes"/>
16+
<description value="Correct category should be highlighted in the navigation menu when navigating through categories and products on the storefront based on store code and having no suffix"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="AC-10852"/>
19+
<group value="Catalog"/>
20+
</annotations>
21+
<before>
22+
<!-- Precondition Step 2: Set configuration: Add Store Code to Urls: Yes -->
23+
<magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="enableStoreCodeInUrl" after="clickSaveButton"/>
24+
<!-- Set configuration: Remove category URL suffix -->
25+
<magentoCLI command="config:set {{CategoriesUrlSuffix.path}} {{CategoriesUrlSuffix.label}}" stepKey="setCategoryUrlSuffixEmpty" after="enableStoreCodeInUrl"/>
26+
<!-- Set configuration: Remove product URL suffix -->
27+
<magentoCLI command="config:set {{ProductsUrlSuffix.path}} {{ProductsUrlSuffix.label}}" stepKey="setProductUrlSuffixEmpty" after="setCategoryUrlSuffixEmpty"/>
28+
</before>
29+
<after>
30+
<!-- Reset configuration: Restore store code URL -->
31+
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
32+
<!-- Reset configuration: Restore default category URL suffix -->
33+
<magentoCLI command="config:set {{CategoriesUrlSuffix.path}} {{CategoriesUrlSuffix.value}}" stepKey="resetCategoryUrlSuffixAsDefault"/>
34+
<!-- Reset configuration: Restore default product URL suffix -->
35+
<magentoCLI command="config:set {{ProductsUrlSuffix.path}} {{ProductsUrlSuffix.value}}" stepKey="resetProductUrlSuffixAsDefault"/>
36+
</after>
37+
<remove keyForRemoval="navigateToCategoryStorefront"/>
38+
<!-- Step 7: Open direct Category 1.2 url -> Check that Cat 1.2 is highlighted & parent Cat 1 is also highlighted -->
39+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCategoryPageStorefront" after="assertParentCategoryHasActiveChild_Try4">
40+
<argument name="page" value="/default/$$createCat1.custom_attributes[url_key]$$/$$createCat12.custom_attributes[url_key]$$"/>
41+
</actionGroup>
42+
<remove keyForRemoval="navigateToProductStorefront"/>
43+
<!-- Step 9: Open Product 1.1-1.2 direct url with category & store in it -> Check that only categories Cat 1 & Cat 1.2 are highlighted -->
44+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToProductPageStorefront" after="assertParentCategoryHasActiveChild_Try6">
45+
<argument name="page" value="/default/$$createCat1.custom_attributes[url_key]$$/$$createCat12.custom_attributes[url_key]$$/$$createProduct1112.custom_attributes[url_key]$$"/>
46+
</actionGroup>
47+
</test>
48+
</tests>

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,6 @@
5656
<element name="twoDayAMFedexMethod" type="text" selector="//tr[td[@id='label_method_FEDEX_2_DAY_AM_fedex']]//td[contains(@class, 'col-method') and contains(text(), '2 Day AM')]"/>
5757
<element name="standardOvernightFedexMethod" type="text" selector="//tr[td[@id='label_method_STANDARD_OVERNIGHT_fedex']]//td[contains(@class, 'col-method') and contains(text(), 'Standard Overnight')]"/>
5858
<element name="priorityOvernightFedexMethod" type="text" selector="//tr[td[@id='label_method_PRIORITY_OVERNIGHT_fedex']]//td[contains(@class, 'col-method') and contains(text(), 'Priority Overnight')]"/>
59+
<element name="fedexExpressShipping" type="text" selector="//tr[td[@class='col col-carrier' and normalize-space(text())='Federal Express'] and number(translate(normalize-space(td[@class='col col-price']), '$', '')) > 0]"/>
5960
</section>
6061
</sections>

0 commit comments

Comments
 (0)