MAGETWO-39392: Merge and Fix Builds

arkadiych · Olexii Korshenko · commit 6d3c2ed7ac20 · 2015-07-03T11:44:52.000+03:00
diff --git a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/CurrencySymbol/SaveTest.php b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/CurrencySymbol/SaveTest.php
@@ -141,7 +141,7 @@ public function testExecute()
 
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccess')
-            ->with(__('The custom currency symbols were applied.'));
+            ->with(__('You applied the custom currency symbols.'));
 
         $this->action->execute();
     }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function testExecute()`
`141`	`141`
`142`	`142`	`$this->messageManagerMock->expects($this->once())`
`143`	`143`	`->method('addSuccess')`
`144`		`- ->with(__('The custom currency symbols were applied.'));`
	`144`	`+ ->with(__('You applied the custom currency symbols.'));`
`145`	`145`
`146`	`146`	`$this->action->execute();`
`147`	`147`	`}`