Merge remote-tracking branch 'origin/MAGETWO-62428' into 2.1-prs2

ameysar · ameysar · commit 6f6cb4b23a67 · 2017-01-03T16:44:18.000+02:00
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
@@ -399,4 +399,11 @@ public function testRefundWithException()
 
         $this->creditmemoService->refund($creditMemoMock, true);
     }
+
+    protected function tearDown()
+    {
+        \Magento\Framework\Phrase::setRenderer(
+            new \Magento\Framework\Phrase\Renderer\Placeholder()
+        );
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -399,4 +399,11 @@ public function testRefundWithException()`
`399`	`399`
`400`	`400`	`$this->creditmemoService->refund($creditMemoMock, true);`
`401`	`401`	`}`
	`402`	`+`
	`403`	`+ protected function tearDown()`
	`404`	`+ {`
	`405`	`+ \Magento\Framework\Phrase::setRenderer(`
	`406`	`+ new \Magento\Framework\Phrase\Renderer\Placeholder()`
	`407`	`+ );`
	`408`	`+ }`
`402`	`409`	`}`