From 26a83d525ef36b868a4df22d3ffe7eeda12f23aa Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 11 Jan 2018 16:41:48 +0200
Subject: [PATCH] magento/magento2#12147: The function
 "isUsingStaticUrlsAllowed" (configuration setting
 "cms/wysiwyg/use_static_urls_in_catalog") doesn't have any effect with the
 WYSIWYG editor image insertion

---
 ...gCheckIsUsingStaticUrlsAllowedObserver.php |   2 +-
 ...ckIsUsingStaticUrlsAllowedObserverTest.php | 104 ++++++++++++++++++
 2 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Unit/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserverTest.php

diff --git a/app/code/Magento/Catalog/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserver.php b/app/code/Magento/Catalog/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserver.php
index 7fe428dffa6..cb05f1b14e7 100644
--- a/app/code/Magento/Catalog/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserver.php
+++ b/app/code/Magento/Catalog/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserver.php
@@ -32,7 +32,7 @@ class CatalogCheckIsUsingStaticUrlsAllowedObserver implements ObserverInterface
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        $storeId = $observer->getEvent()->getData('store_id');
+        $storeId = (int)$observer->getEvent()->getData('store_id');
         $result = $observer->getEvent()->getData('result');
         $result->isAllowed = $this->catalogData->setStoreId($storeId)->isUsingStaticUrlsAllowed();
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserverTest.php b/app/code/Magento/Catalog/Test/Unit/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserverTest.php
new file mode 100644
index 00000000000..c6b41b8d76e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Observer/CatalogCheckIsUsingStaticUrlsAllowedObserverTest.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Observer;
+
+use Magento\Catalog\Helper\Data;
+use Magento\Catalog\Observer\CatalogCheckIsUsingStaticUrlsAllowedObserver;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for CatalogCheckIsUsingStaticUrlsAllowedObserver observer.
+ */
+class CatalogCheckIsUsingStaticUrlsAllowedObserverTest extends TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var CatalogCheckIsUsingStaticUrlsAllowedObserver
+     */
+    private $model;
+
+    /**
+     * @var Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $catalogData;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->catalogData = $this->getMockBuilder(Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->model = $objectManager->getObject(
+            CatalogCheckIsUsingStaticUrlsAllowedObserver::class,
+            ['catalogData' => $this->catalogData]
+        );
+    }
+
+    /**
+     * Test observer can correctly handle non integer store id values.
+     *
+     * @dataProvider executeDataProvider
+     * @param string|int $storeId
+     * @return void
+     */
+    public function testExecute($storeId)
+    {
+        $result = new \stdClass();
+        /** @var Observer|\PHPUnit_Framework_MockObject_MockObject $observer */
+        $observer = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $event = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $event->expects($this->exactly(2))
+            ->method('getData')
+            ->withConsecutive(
+                $this->identicalTo('store_id'),
+                $this->identicalTo('result')
+            )->willReturnOnConsecutiveCalls(
+                $storeId,
+                $result
+            );
+        $observer->expects($this->exactly(2))
+            ->method('getEvent')
+            ->willReturn($event);
+        $this->catalogData->expects($this->once())
+            ->method('setStoreId')
+            ->with(0)
+            ->willReturnSelf();
+        $this->catalogData->expects($this->once())
+            ->method('isUsingStaticUrlsAllowed')
+            ->willReturn(true);
+        $this->model->execute($observer);
+        $this->assertTrue($result->isAllowed);
+    }
+
+    /**
+     * Provide test data for testExecute().
+     *
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            [
+                'store_id' => 0,
+            ],
+            [
+                'store_id' => ''
+            ]
+        ];
+    }
+}
-- 
GitLab