MC-38620: Merge release branch into 2.4-develop

fix tests after merge

Author: zakdma

app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php

@@ -271,11 +271,6 @@ public function testDispatchWithDefaultCustomerGroupId()
             ->method('getCustomerGroupId')
             ->willReturn('customerGroupId');
         $this->customerMock->expects($this->exactly(2))->method('getId')->willReturn('1');
-        $this->groupManagementMock->expects($this->once())
-            ->method('getDefaultGroup')
-            ->willReturn($this->groupInterfaceMock);
-        $this->groupInterfaceMock->expects($this->once())
-            ->method('getId')->willReturn('defaultCustomerGroupId');
         /** Assertions */
         $this->quoteAddressMock->expects($this->once())
             ->method('setPrevQuoteCustomerGroupId')

dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php

@@ -120,29 +120,6 @@ public function testAddDownloadableProductWithOptions(): void
         $this->assertEquals('Downloadable Product Sample', $wishlistItemSamples[0]['title']);
     }
 
-    /**
-     * @magentoConfigFixture default_store wishlist/general/active 0
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable_with_custom_options.php
-     */
-    public function testAddDownloadableProductOnDisabledWishlist(): void
-    {
-        $qty = 2;
-        $sku = 'downloadable-product-with-purchased-separately-links';
-        $links = $this->getProductsLinks($sku);
-        $linkId = key($links);
-        $itemOptions = $this->getCustomOptionsWithIDV2ForQueryBySku->execute($sku);
-        $itemOptions['selected_options'][] = $this->generateProductLinkSelectedOptions($linkId);
-        $productOptionsQuery = trim(preg_replace(
-            '/"([^"]+)"\s*:\s*/',
-            '$1:',
-            json_encode($itemOptions)
-        ), '{}');
-        $query = $this->getQuery($qty, $sku, $productOptionsQuery);
-        $this->expectExceptionMessage('The wishlist configuration is currently disabled.');
-        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-    }
-
     /**
      * Function returns array of all product's links
      *