Merge remote-tracking branch 'magento2/develop' into sprint-54-bf

Dooffy · Dooffy · commit 13417a4ad011 · 2015-06-18T17:32:47.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php
@@ -31,6 +31,7 @@ public function testExecuteWithoutError()
 
     public function testExecuteWithError()
     {
+        $this->markTestSkipped('MAGETWO-38528');
         $this->dispatch('backend/reports/report_product/viewed/filter/' .
             'cGVyaW9kX3R5cGU9ZGF5JmZyb209NyUyRjElMkY2NyZ0bz1odG1sJTIwZm90bSZzaG93X2VtcHR5X3Jvd3M9MA==');
         $actual = $this->getResponse()->getBody();

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public function testExecuteWithoutError()`
`31`	`31`
`32`	`32`	`public function testExecuteWithError()`
`33`	`33`	`{`
	`34`	`+ $this->markTestSkipped('MAGETWO-38528');`
`34`	`35`	`$this->dispatch('backend/reports/report_product/viewed/filter/' .`
`35`	`36`	`'cGVyaW9kX3R5cGU9ZGF5JmZyb209NyUyRjElMkY2NyZ0bz1odG1sJTIwZm90bSZzaG93X2VtcHR5X3Jvd3M9MA==');`
`36`	`37`	`$actual = $this->getResponse()->getBody();`