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

…execute() - Fix merge error
magento · Oct 28, 2015 · 4b9a7c7 · 4b9a7c7
1 parent b12c316
commit 4b9a7c7
Showing 1 changed file with 2 additions and 2 deletions.
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());
     }
 }