Merge remote-tracking branch 'origin/MAGETWO-49308' into BUGS

Author: Sergey Semenov

app/code/Magento/Ui/Model/Manager.php

@@ -155,10 +155,7 @@ public function prepareData($name)
     {
         if ($name === null || $this->hasData($name)) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase(
-                    'Initialization error component, check the '
-                    . 'spelling of the name or the correctness of the call.'
-                )
+                new \Magento\Framework\Phrase("Invalid UI Component element name: '%1'", [$name])
             );
         }
         $this->componentsPool = $this->arrayObjectFactory->create();

app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php

@@ -126,11 +126,11 @@ public function testGetReader()
         $this->assertEquals($this->uiReader, $this->manager->getReader('some_name'));
     }
 
-    public function testPrepareDataWithException()
+    public function testPrepareDataWithoutName()
     {
         $this->setExpectedException(
             'Magento\Framework\Exception\LocalizedException',
-            __('Initialization error component, check the spelling of the name or the correctness of the call.')
+            __("Invalid UI Component element name: ''")
         );
         $this->manager->prepareData(null);
     }