Skip to content

Commit 0f2832b

Browse files
committed
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
1 parent a81b5ad commit 0f2832b

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ class Save extends \Magento\Backend\App\Action
4646
* @param DataPersistorInterface $dataPersistor
4747
* @param \Magento\Cms\Model\PageFactory $pageFactory
4848
* @param \Magento\Cms\Api\PageRepositoryInterface $pageRepository
49-
*
5049
*/
5150
public function __construct(
5251
Action\Context $context,
@@ -62,6 +61,7 @@ public function __construct(
6261
$this->pageRepository = $pageRepository
6362
?: \Magento\Framework\App\ObjectManager::getInstance()
6463
->get(\Magento\Cms\Api\PageRepositoryInterface::class);
64+
6565
parent::__construct($context);
6666
}
6767

app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ protected function setUp()
109109
'dataProcessor' => $this->dataProcessorMock,
110110
'dataPersistor' => $this->dataPersistorMock,
111111
'pageFactory' => $this->pageFactory,
112-
'pageRepository' => $this->pageRepository
112+
'pageRepository' => $this->pageRepository,
113113
]
114114
);
115115
}
@@ -258,7 +258,9 @@ public function testSaveActionThrowsException()
258258
->method('getId')
259259
->willReturn(true);
260260
$page->expects($this->once())->method('setData');
261-
$this->pageRepository->expects($this->once())->method('save')->with($page)
261+
$this->pageRepository->expects($this->once())
262+
->method('save')
263+
->with($page)
262264
->willThrowException(new \Exception('Error message.'));
263265

264266
$this->messageManagerMock->expects($this->never())

app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
namespace Magento\CmsUrlRewrite\Test\Unit\Model;
77

8-
98
/**
109
* Test for \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator class.
1110
*/
@@ -56,7 +55,7 @@ protected function setUp()
5655
[
5756
'storeManager' => $this->storeManager,
5857
'urlRewriteFactory' => $this->urlRewriteFactory,
59-
'cmsPageUrlPathGenerator' => $this->urlPathGenerator
58+
'cmsPageUrlPathGenerator' => $this->urlPathGenerator,
6059
]
6160
);
6261
}
@@ -69,6 +68,7 @@ public function testGenerateForAllStores()
6968
$cmsPage = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
7069
->disableOriginalConstructor()
7170
->getMock();
71+
7272
$cmsPage->expects($this->any())->method('getStores')->willReturn($initializesStores);
7373
$store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
7474
->setMethods(['getStoreId'])
@@ -96,6 +96,7 @@ public function testGenerateForSpecificStores()
9696
$cmsPage = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
9797
->disableOriginalConstructor()
9898
->getMock();
99+
99100
$cmsPage->expects($this->any())->method('getStores')->willReturn($initializesStores);
100101
$firstStore = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
101102
->setMethods(['getStoreId'])

dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageFormSingleStoreMode.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,14 @@ public function processAssert(
3737
$errors = $this->verifyData($cmsFixtureData, $cmsFormData);
3838
\PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
3939
}
40+
41+
/**
42+
* CMS Page content equals to data from fixture.
43+
*
44+
* @return string
45+
*/
46+
public function toString()
47+
{
48+
return 'CMS Page content equals to data from fixture.';
49+
}
4050
}

dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageOnFrontend.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ public function processAssert(
4747
*/
4848
public function toString()
4949
{
50-
return 'CMS Page content equals to data from fixture.';
50+
return "CMS Page content isn't displayed on frontend.";
5151
}
5252
}

0 commit comments

Comments
 (0)