Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr1

Author: zakdma

app/code/Magento/Translation/Model/Js/DataProvider.php

@@ -113,7 +113,7 @@ public function getData($themePath)
                     }
                 } catch (\Exception $e) {
                     throw new LocalizedException(
-                        sprintf(__('Error while translating phrase "%s" in file %s.'), $phrase, $filePath[0])
+                        __('Error while translating phrase "%s" in file %s.', $phrase, $filePath[0])
                     );
                 }
             }
@@ -145,7 +145,7 @@ protected function getPhrases($content)
             }
             if (false === $result) {
                 throw new LocalizedException(
-                    sprintf(__('Error while generating js translation dictionary: "%s"'), error_get_last())
+                    __('Error while generating js translation dictionary: "%s"', error_get_last())
                 );
             }
         }

app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Translation\Test\Unit\Model\Js;
 
 use Magento\Framework\App\State;
@@ -148,4 +149,39 @@ public function testGetData()
 
         $this->assertEquals($expectedResult, $this->model->getData($themePath));
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testGetDataThrowingException()
+    {
+        $themePath = 'blank';
+        $areaCode = 'adminhtml';
+
+        $patterns = ['~\$\.mage\.__\(([\'"])(.+?)\1\)~'];
+
+        $this->fileReadMock->expects($this->once())
+            ->method('readAll')
+            ->willReturn('content1$.mage.__("hello1")content1');
+
+        $this->appStateMock->expects($this->once())
+            ->method('getAreaCode')
+            ->willReturn($areaCode);
+        $this->filesUtilityMock->expects($this->any())
+            ->method('getJsFiles')
+            ->willReturn(['test']);
+        $this->filesUtilityMock->expects($this->any())
+            ->method('getStaticHtmlFiles')
+            ->willReturn(['test']);
+
+        $this->configMock->expects($this->any())
+            ->method('getPatterns')
+            ->willReturn($patterns);
+
+        $this->translateMock->expects($this->once())
+            ->method('render')
+            ->willThrowException(new \Exception('Test exception'));
+
+        $this->model->getData($themePath);
+    }
 }

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddVariableToWYSIWYGNewsletterCest.xml

@@ -12,6 +12,7 @@
             <features value="MAGETWO-36659-[CMS] WYSIWYG update"/>
             <stories value="MAGETWO-42158-Variable with WYSIWYG"/>
             <group value="Newsletter"/>
+            <group value="skip"/>
             <title value="Admin should be able to add variable to WYSIWYG Editor of Newsletter"/>
             <description value="Admin should be able to add variable to WYSIWYG Editor Newsletter"/>
             <testCaseId value="MAGETWO-84379"/>