Merge branch 'fix-30473' into HB-PR-delivery-Oct

Author: cpartica

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php

@@ -7,14 +7,16 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Category;
 
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Category\FileInfo;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DirectoryList;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\Filesystem\DirectoryList;
-use Magento\Catalog\Model\Category\FileInfo;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 
 /**
  * Resolve category image to a fully qualified URL
@@ -52,15 +54,15 @@ public function resolve(
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
-        /** @var \Magento\Catalog\Model\Category $category */
+        /** @var Category $category */
         $category = $value['model'];
         $imagePath = $category->getData('image');
         if (empty($imagePath)) {
             return null;
         }
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();
-        $baseUrl = $store->getBaseUrl();
+        $baseUrl = $store->getBaseUrl(UrlInterface::URL_TYPE_WEB);
 
         $filenameWithMedia =  $this->fileInfo->isBeginsWithMediaDirectoryPath($imagePath)
             ? $imagePath : $this->formatFileNameWithMediaCategoryFolder($imagePath);

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

@@ -395,8 +395,9 @@ public function testMinimumMatchQueryLength()
      * Test category image full name is returned
      *
      * @magentoApiDataFixture Magento/Catalog/_files/catalog_category_with_long_image_name.php
+     * @magentoConfigFixture default_store web/seo/use_rewrites 0
      */
-    public function testCategoryImageName()
+    public function testCategoryImageNameAndSeoDisabled()
     {
         /** @var CategoryCollection $categoryCollection */
         $categoryCollection = Bootstrap::getObjectManager()->get(CategoryCollection::class);
@@ -427,14 +428,13 @@ public function testCategoryImageName()
         $categories = $response['categories'];
         $this->assertArrayNotHasKey('errors', $response);
         $this->assertNotEmpty($response['categories']['items']);
-        $expectedImageUrl = str_replace('index.php/', '', $expectedImageUrl);
-        $categories['items'][0]['image'] = str_replace('index.php/', '', $categories['items'][0]['image']);
         $this->assertEquals('Parent Image Category', $categories['items'][0]['name']);
         $this->assertEquals($expectedImageUrl, $categories['items'][0]['image']);
     }
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @magentoConfigFixture default_store web/seo/use_rewrites 1
      */
     public function testFilterByUrlPathTopLevelCategory()
     {