MAGETWO-44491: [TD] ActionInterface has Method dispatch() Instead of execute()

Yu Tang · Yu Tang · commit 4b9a7c7cbacc · 2015-10-28T16:36:47.000-05:00
- Fix merge error
diff --git a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php
@@ -95,7 +95,7 @@ protected function setUp()
         ]);
     }
 
-    public function testExecute()
+    public function testExecuteInternal()
     {
         $this->viewMock->expects($this->once())
             ->method('getPage')
@@ -110,6 +110,6 @@ public function testExecute()
             ->method('prepend')
             ->willReturnSelf();
 
-        $this->assertNull($this->object->execute());
+        $this->assertNull($this->object->executeInternal());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ protected function setUp()`
`95`	`95`	`]);`
`96`	`96`	`}`
`97`	`97`
`98`		`- public function testExecute()`
	`98`	`+ public function testExecuteInternal()`
`99`	`99`	`{`
`100`	`100`	`$this->viewMock->expects($this->once())`
`101`	`101`	`->method('getPage')`
`@@ -110,6 +110,6 @@ public function testExecute()`
`110`	`110`	`->method('prepend')`
`111`	`111`	`->willReturnSelf();`
`112`	`112`
`113`		`- $this->assertNull($this->object->execute());`
	`113`	`+ $this->assertNull($this->object->executeInternal());`
`114`	`114`	`}`
`115`	`115`	`}`