Merge branch '2.4-develop' of https://github.com/adobe-commerce-tier-4/magento2ce into ACP2E-4231

Author: abukatar

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

@@ -36,7 +36,7 @@
         <element name="asLowAsLabel" type="input" selector="//strong[@id='block-related-heading']/following::span[@class='price-label'][1]"/>
         <element name="asLowAsLabelAgain" type="input" selector="//strong[@id='block-related-heading']/following::span[@class='price-label'][2]"/>
         <element name="specialPriceValue" type="text" selector="//span[@class='special-price']//span[@class='price']"/>
-        <element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]"/>
+        <element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]//span"/>
         <element name="clickForPriceLink" type="text" selector="//div[@class='price-box price-final_price']//a[contains(text(), 'Click for price')]"/>
         <element name="addReviewLink" type="text" selector="//div[@class='reviews-actions']//a[@class='action add']"/>
         <element name="fptPrice" type="text" selector=".//*[@class='weee']/span"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest/StorefrontConfigurableProductMSRPCovertTest.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontConfigurableProductMSRPCovertTest">
@@ -112,6 +113,7 @@
         </actionGroup>
 
         <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1.value$$" stepKey="selectFirstOption"/>
+        <waitForAjaxLoad stepKey="waitForAjaxload"/>
         <waitForElement selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="waitForLoad"/>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="grabProductMapPrice"/>
         <assertNotEquals stepKey="assertProductMapPrice">

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductVisibilitySearchTest.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ProductVisibilitySearchTest extends GraphQlAbstract
+{
+    /**
+     * Verify that a product with "Catalog Only" visibility
+     * is not returned in GraphQL product search results.
+     */
+    #[DataFixture(
+        ProductFixture::class,
+        ['price' => 1, 'name' => 'API_TEST', 'visibility' => Visibility::VISIBILITY_IN_CATALOG],
+        'prod1'
+    )]
+    public function testProductNotReturnedWhenVisibilityIsCatalogOnly(): void
+    {
+        $query = <<<'QUERY'
+            query {
+              products(
+                search: "API"
+                filter: { price: { from: "1" } }
+              ) {
+                items {
+                  name
+                  sku
+                }
+              }
+            }
+            QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertEmpty(
+            $response['products']['items'],
+            'Expected no products to be returned when product is set to Catalog-only visibility.'
+        );
+    }
+}