Merge remote-tracking branch 'origin/MC-31405' into MC-31551

Author: cpartica

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

@@ -56,7 +56,7 @@ public function resolve(
         $mediaPath = $this->directoryList->getUrlPath('media');
         $pos = strpos($imagePath, $mediaPath);
         if ($pos !== false) {
-            $imagePath = substr($imagePath, $pos + strlen($mediaPath), strlen($baseUrl));
+            $imagePath = substr($imagePath, $pos + strlen($mediaPath));
         }
         $imageUrl = rtrim($baseUrl, '/') . '/' . ltrim($imagePath, '/');
 

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

@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -16,6 +17,16 @@
  */
 class CategoryListTest extends GraphQlAbstract
 {
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      * @dataProvider filterSingleCategoryDataProvider
@@ -333,7 +344,7 @@ public function testEmptyFiltersReturnRootCategory()
     }
 }
 QUERY;
-        $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
         $storeRootCategoryId = $storeManager->getStore()->getRootCategoryId();
 
         $result = $this->graphQlQuery($query);
@@ -369,6 +380,36 @@ public function testMinimumMatchQueryLength()
         $this->assertEquals([], $result['categoryList']);
     }
 
+    /**
+     * Test category image full name is returned
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testCategoryImageName()
+    {
+        $query = <<<QUERY
+    {
+categoryList(filters: {ids: {in: ["333"]}}) {
+  id
+  name
+  image
+ }
+}
+QUERY;
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeBaseUrl = $storeManager->getStore()->getBaseUrl('media');
+
+        $expected = "catalog/category/magento_long_image_name_magento_long_image_name_magento_long_image_name.jpg";
+        $expectedImageUrl = rtrim($storeBaseUrl, '/') . '/' . $expected;
+
+        $response = $this->graphQlQuery($query);
+        $categoryList = $response['categoryList'];
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertNotEmpty($response['categoryList']);
+        $this->assertEquals('Category 1', $categoryList[0]['name']);
+        $this->assertEquals($expectedImageUrl, $categoryList[0]['image']);
+    }
+
     /**
      * @return array
      */

dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_image.php

@@ -13,7 +13,10 @@
 $mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
     ->getDirectoryWrite(DirectoryList::MEDIA);
 $fileName = 'magento_small_image.jpg';
+$fileNameLong = 'magento_long_image_name_magento_long_image_name_magento_long_image_name.jpg';
 $filePath = 'catalog/category/' . $fileName;
+$filePathLong = 'catalog/category/' . $fileNameLong;
 $mediaDirectory->create('catalog/category');
 
 copy(__DIR__ . DIRECTORY_SEPARATOR . $fileName, $mediaDirectory->getAbsolutePath($filePath));
+copy(__DIR__ . DIRECTORY_SEPARATOR . $fileNameLong, $mediaDirectory->getAbsolutePath($filePathLong));

dev/tests/integration/testsuite/Magento/Catalog/_files/category.php

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+require 'catalog_category_image.php';
+
 $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
 $category->isObjectNew(true);
 $category->setId(
@@ -18,6 +20,8 @@
     '1/2/333'
 )->setLevel(
     2
+)->setImage(
+    $filePathLong
 )->setAvailableSortBy(
     ['position', 'name']
 )->setDefaultSortBy(