From 623d29d17928576b16e33010bfac4748aac5dd44 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Fri, 4 Nov 2016 11:26:51 +0200
Subject: [PATCH] MAGETWO-56863: [GitHub] Saving CMS page does not create URL
 rewrite in Magento 2.1.0 with single-store mode #5923

---
 .../Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php | 10 +++++-----
 .../app/Magento/Backend/Test/Repository/ConfigData.xml |  2 +-
 .../Cms/Test/TestCase/CreateCmsPageEntityTest.php      |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php b/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php
index 168343b03cb46..96a964c3d2d33 100644
--- a/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php
+++ b/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php
@@ -11,27 +11,27 @@ class CmsPageUrlRewriteGeneratorTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
-    protected $objectManager;
+    private $objectManager;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $storeManager;
+    private $storeManager;
 
     /**
      * @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $urlRewriteFactory;
+    private $urlRewriteFactory;
 
     /**
      * @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $urlPathGenerator;
+    private $urlPathGenerator;
 
     /**
      * @var \Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator
      */
-    protected $urlRewriteGenerator;
+    private $urlRewriteGenerator;
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
index 2616ddabb097f..fcf6e2ac0c4d0 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
@@ -213,7 +213,7 @@
             </field>
         </dataset>
         <dataset name="enable_single_store_mode">
-            <field name="general/;/enabled" xsi:type="array">
+            <field name="general/single_store_mode/enabled" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
                 <item name="scope_id" xsi:type="number">0</item>
                 <item name="label" xsi:type="string">Yes</item>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
index 061acac7a418c..4f02e7c4caf24 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
@@ -59,7 +59,7 @@ class CreateCmsPageEntityTest extends Injectable
      *
      * @var string
      */
-    protected $configData;
+    private $configData;
 
     /**
      * Inject pages.
@@ -104,7 +104,7 @@ public function test(array $data, $fixtureType, $configData = '')
     }
 
     /**
-     * Disable MAP on Config level.
+     * Disable single store mode on config level.
      *
      * @return void
      */