Skip to content

Commit 45b51c9

Browse files
authored
Merge pull request #9502 from magento-gl/spartans_pr_16012025_AC-12124
[Spartans] Revert AC-12124: [Random Bug] Fotorama lib isn't loaded
2 parents 05dc0bb + 434b1fe commit 45b51c9

File tree

9 files changed

+16
-5
lines changed

9 files changed

+16
-5
lines changed

app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<testCaseId value="MC-115"/>
1919
<group value="Bundle"/>
2020
<group value="cloud"/>
21+
<!-- Excluded from PR builds due to AC-12124 -->
22+
<group value="pr_exclude"/>
2123
</annotations>
2224
<before>
2325
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<element name="productImageFullscreen" type="text" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//img[contains(@src, '{{filename}}') and contains(@class, 'full')]" parameterized="true" />
1717
<element name="closeFullscreenImage" type="button" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//*[@data-gallery-role='fotorama__fullscreen-icon']" />
1818
<element name="imageFile" type="text" selector="//div[contains(@class, 'fotorama__active')]//img[contains(@src, '{{filename}}')]" parameterized="true"/>
19-
<element name="imageFileInGallery" type="text" selector="//div[contains(@class, 'gallery-placeholder')]//img[contains(@src, '{{filename}}')]" parameterized="true"/>
19+
<element name="imageFileInGallery" type="text" selector="//div[contains(@class, 'fotorama__loaded--img')]//img[contains(@src, '{{filename}}')]" parameterized="true"/>
2020
<element name="productImageActive" type="text" selector=".product.media div[data-active=true] > img[src*='{{filename}}']" parameterized="true"/>
2121
<element name="productImageInFotorama" type="file" selector=".fotorama__nav__shaft img[src*='{{imageName}}']" parameterized="true" timeout="30"/>
2222
<element name="fotoramaPrevButton" type="button" selector="//*[@data-gallery-role='gallery']//*[@data-gallery-role='nav-wrap']//*[@data-gallery-role='arrow' and contains(@class, 'fotorama__thumb__arr--left')]" timeout="30"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddRemoveProductImageVirtualProductTest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<testCaseId value="MC-103"/>
1919
<group value="Catalog"/>
2020
<group value="cloud"/>
21+
<!-- Excluded from PR builds due to AC-12124 -->
22+
<group value="pr_exclude"/>
2123
</annotations>
2224
<before>
2325
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<severity value="BLOCKER"/>
1717
<testCaseId value="MC-189"/>
1818
<group value="Catalog"/>
19+
<!-- Excluded from PR builds due to AC-12124 -->
20+
<group value="pr_exclude"/>
1921
</annotations>
2022

2123
<before>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductImageWithDotTest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<group value="Catalog"/>
1818
<severity value="AVERAGE"/>
1919
<group value="cloud"/>
20+
<!-- Excluded from PR builds due to AC-12124 -->
21+
<group value="pr_exclude"/>
2022
</annotations>
2123
<before>
2224
<magentoCLI command="config:set system/upload_configuration/enable_resize 0" stepKey="disableImageResizing"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<testCaseId value="MC-101"/>
1919
<group value="ConfigurableProduct"/>
2020
<group value="cloud"/>
21+
<!-- Excluded from PR builds due to AC-12124 -->
22+
<group value="pr_exclude"/>
2123
</annotations>
2224

2325
<before>

app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-117"/>
1919
<group value="Downloadable"/>
20+
<!-- Excluded from PR builds due to AC-12124 -->
21+
<group value="pr_exclude"/>
2022
</annotations>
2123
<before>
2224
<magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>

app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<testCaseId value="MC-106"/>
1919
<group value="GroupedProduct"/>
2020
<group value="cloud"/>
21+
<!-- Excluded from PR builds due to AC-12124 -->
22+
<group value="pr_exclude"/>
2123
</annotations>
2224
<before>
2325
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

lib/web/mage/gallery/gallery.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,7 @@ define([
307307

308308
$fotoramaElement = $element.find('[data-gallery-role="gallery"]');
309309

310-
/* Check if fotorama library is loaded */
311-
if (typeof $fotoramaElement.fotorama === 'function') {
312-
$fotoramaElement.fotorama(config);
313-
}
310+
$fotoramaElement.fotorama(config);
314311
$fotoramaElement.find('.fotorama__stage__frame.fotorama__active')
315312
.one('f:load', function () {
316313
$element

0 commit comments

Comments
 (0)