MAGETWO-52215: Cms pages isn't synchronized with core_config_data

Author: shiftedreality

app/code/Magento/Cms/Model/Page.php

@@ -528,9 +528,15 @@ public function beforeSave()
 
         switch ($originalIdentifier) {
             case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_NO_ROUTE_PAGE):
-                throw new LocalizedException(__('This identifier is reserved for 404 error page in configuration.'));
+                throw new LocalizedException(
+                    __('This identifier is reserved for "CMS No Route Page" in configuration.')
+                );
             case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_HOME_PAGE):
-                throw new LocalizedException(__('This identifier is reserved for home page in configuration.'));
+                throw new LocalizedException(__('This identifier is reserved for "CMS Home Page" in configuration.'));
+            case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_NO_COOKIES_PAGE):
+                throw new LocalizedException(
+                    __('This identifier is reserved for "CMS No Cookies Page" in configuration.')
+                );
         }
 
         return parent::beforeSave();

app/code/Magento/Cms/Test/Unit/Model/PageTest.php

@@ -119,7 +119,7 @@ public function testCheckIdentifier()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage This identifier is reserved for 404 error page in configuration.
+     * @expectedExceptionMessage This identifier is reserved for "CMS No Route Page" in configuration.
      */
     public function testBeforeSave404Identifier()
     {
@@ -145,7 +145,7 @@ public function testBeforeSave404Identifier()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage This identifier is reserved for home page in configuration.
+     * @expectedExceptionMessage This identifier is reserved for "CMS Home Page" in configuration.
      */
     public function testBeforeSaveHomeIdentifier()
     {
@@ -168,4 +168,30 @@ public function testBeforeSaveHomeIdentifier()
 
         $this->model->beforeSave();
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage This identifier is reserved for "CMS No Cookies Page" in configuration.
+     */
+    public function testBeforeSaveNoCookiesIdentifier()
+    {
+        $this->model->setId(1);
+        $this->model->setOrigData('identifier', 'no-cookies');
+        $this->model->setIdentifier('no-cookies2');
+
+        $this->scopeConfigMock->expects($this->atLeastOnce())
+            ->method('getValue')
+            ->willReturnMap(
+                [
+                    [
+                        \Magento\Cms\Helper\Page::XML_PATH_NO_COOKIES_PAGE,
+                        ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                        null,
+                        'no-cookies'
+                    ]
+                ]
+            );
+
+        $this->model->beforeSave();
+    }
 }