MAGETWO-58383: [Backport] - [GitHub] Saving CMS page does not create …

…URL rewrite in Magento 2.1.0 with single-store mode #5923 - for 2.1
magento · Feb 8, 2018 · 0f2832b · 0f2832b
1 parent a81b5ad
commit 0f2832b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -46,7 +46,6 @@ class Save extends \Magento\Backend\App\Action
      * @param DataPersistorInterface $dataPersistor
      * @param \Magento\Cms\Model\PageFactory $pageFactory
      * @param \Magento\Cms\Api\PageRepositoryInterface $pageRepository
-     *
      */
     public function __construct(
         Action\Context $context,
@@ -62,6 +61,7 @@ public function __construct(
         $this->pageRepository = $pageRepository
             ?: \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Cms\Api\PageRepositoryInterface::class);
+
         parent::__construct($context);
     }
 

diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
@@ -109,7 +109,7 @@ protected function setUp()
                 'dataProcessor' => $this->dataProcessorMock,
                 'dataPersistor' => $this->dataPersistorMock,
                 'pageFactory' => $this->pageFactory,
-                'pageRepository' => $this->pageRepository
+                'pageRepository' => $this->pageRepository,
             ]
         );
     }
@@ -258,7 +258,9 @@ public function testSaveActionThrowsException()
             ->method('getId')
             ->willReturn(true);
         $page->expects($this->once())->method('setData');
-        $this->pageRepository->expects($this->once())->method('save')->with($page)
+        $this->pageRepository->expects($this->once())
+            ->method('save')
+            ->with($page)
             ->willThrowException(new \Exception('Error message.'));
 
         $this->messageManagerMock->expects($this->never())

diff --git a/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php b/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\CmsUrlRewrite\Test\Unit\Model;
 
-
 /**
  * Test for \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator class.
  */
@@ -56,7 +55,7 @@ protected function setUp()
             [
                 'storeManager' => $this->storeManager,
                 'urlRewriteFactory' => $this->urlRewriteFactory,
-                'cmsPageUrlPathGenerator' => $this->urlPathGenerator
+                'cmsPageUrlPathGenerator' => $this->urlPathGenerator,
             ]
         );
     }
@@ -69,6 +68,7 @@ public function testGenerateForAllStores()
         $cmsPage = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
             ->disableOriginalConstructor()
             ->getMock();
+
         $cmsPage->expects($this->any())->method('getStores')->willReturn($initializesStores);
         $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
             ->setMethods(['getStoreId'])
@@ -96,6 +96,7 @@ public function testGenerateForSpecificStores()
         $cmsPage = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
             ->disableOriginalConstructor()
             ->getMock();
+
         $cmsPage->expects($this->any())->method('getStores')->willReturn($initializesStores);
         $firstStore = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
             ->setMethods(['getStoreId'])

diff --git a/...sts/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageFormSingleStoreMode.php b/...sts/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageFormSingleStoreMode.php
@@ -37,4 +37,14 @@ public function processAssert(
         $errors = $this->verifyData($cmsFixtureData, $cmsFormData);
         \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
     }
+
+    /**
+     * CMS Page content equals to data from fixture.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'CMS Page content equals to data from fixture.';
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageOnFrontend.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageOnFrontend.php
@@ -47,6 +47,6 @@ public function processAssert(
      */
     public function toString()
     {
-        return 'CMS Page content equals to data from fixture.';
+        return "CMS Page content isn't displayed on frontend.";
     }
 }