Merge branch '2.4-develop' into ACQE-6650_mainline_PR_deployment

mage-os · Jun 24, 2024 · 356c5db · 356c5db
2 parents f76a821 + b4868cd
commit 356c5db
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 0 deletions.
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
@@ -18,6 +18,9 @@
             <testCaseId value="MC-115"/>
             <group value="Bundle"/>
             <group value="cloud"/>
+            <skip>
+                <issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddRemoveProductImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddRemoveProductImageVirtualProductTest.xml
@@ -18,6 +18,9 @@
             <testCaseId value="MC-103"/>
             <group value="Catalog"/>
             <group value="cloud"/>
+            <skip>
+                <issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

diff --git a/...ento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml b/...ento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
@@ -16,6 +16,9 @@
             <severity value="BLOCKER"/>
             <testCaseId value="MC-189"/>
             <group value="Catalog"/>
+            <skip>
+                <issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
+            </skip>
         </annotations>
 
         <before>

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
@@ -18,6 +18,9 @@
             <testCaseId value="MC-101"/>
             <group value="ConfigurableProduct"/>
             <group value="cloud"/>
+            <skip>
+                <issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
+            </skip>
         </annotations>
 
         <before>

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml
@@ -61,6 +61,7 @@
         <!-- Verify country Belgium can be saved without state as state not required -->
         <actionGroup ref="StoreFrontClickEditDefaultShippingAddressActionGroup" stepKey="clickOnDefaultShippingAddress"/>
         <selectOption selector="{{StorefrontCustomerAddressFormSection.country}}" userInput="Belgium" stepKey="selectCountry"/>
+        <waitForAjaxLoad stepKey="waitForCountryDataToApply" />
         <selectOption selector="{{StorefrontCustomerAddressFormSection.state}}" userInput="Please select a region, state or province." stepKey="selectState"/>
         <actionGroup ref="AdminSaveCustomerAddressActionGroup" stepKey="saveAddress"/>
         <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="Belgium" stepKey="seeAssertCustomerDefaultShippingAddressCountry"/>

diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-117"/>
             <group value="Downloadable"/>
+            <skip>
+                <issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
+            </skip>
         </annotations>
         <before>
             <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>

diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
@@ -18,6 +18,9 @@
             <testCaseId value="MC-106"/>
             <group value="GroupedProduct"/>
             <group value="cloud"/>
+            <skip>
+                <issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>