浏览代码

Fixed broken tests

Thanos 13 年之前
父节点
当前提交
008babb4a2
共有 1 个文件被更改,包括 13 次插入6 次删除
  1. 13 6
      Tests/Controller/AdminHelperTest.php

+ 13 - 6
Tests/Controller/AdminHelperTest.php

@@ -203,12 +203,15 @@ class AdminHelperTest extends \PHPUnit_Framework_TestCase
         $mockRenderer = $this->getMockBuilder('Symfony\Bridge\Twig\Form\TwigRendererInterface')
         $mockRenderer = $this->getMockBuilder('Symfony\Bridge\Twig\Form\TwigRendererInterface')
             ->disableOriginalConstructor()
             ->disableOriginalConstructor()
             ->getMock();
             ->getMock();
+
+        $mockRenderer->expects($this->once())
+            ->method('renderWidget')
+            ->will($this->returnValue(new Response));
 
 
-        $formExtension = $this->getMock('Twig_ExtensionInterface', array('renderListElement', 'initRuntime', 'getTokenParsers', 'getNodeVisitors', 'getFilters', 'getTests', 'getFunctions', 'getOperators', 'getGlobals', 'getName', 'setTheme', 'renderWidget'));
-
+        $formExtension = $this->getMock('Twig_ExtensionInterface', array('renderListElement', 'initRuntime', 'getTokenParsers', 'getNodeVisitors', 'getFilters', 'getTests', 'getFunctions', 'getOperators', 'getGlobals', 'getName'));
 
 
         $formExtension->expects($this->once())->method('getName')->will($this->returnValue('form'));
         $formExtension->expects($this->once())->method('getName')->will($this->returnValue('form'));
-        $formExtension->expects($this->once())->method('renderWidget')->will($this->returnValue(new Response));
+        $formExtension->expects($this->never())->method('renderWidget');
         $formExtension->expects($this->never())->method('setTheme');
         $formExtension->expects($this->never())->method('setTheme');
         $formExtension->renderer = $mockRenderer;
         $formExtension->renderer = $mockRenderer;
 
 
@@ -280,11 +283,15 @@ class AdminHelperTest extends \PHPUnit_Framework_TestCase
 
 
         $mockRenderer = $this->getMockBuilder('Symfony\Bridge\Twig\Form\TwigRendererInterface')
         $mockRenderer = $this->getMockBuilder('Symfony\Bridge\Twig\Form\TwigRendererInterface')
             ->disableOriginalConstructor()
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock();
+
+        $mockRenderer->expects($this->once())
+            ->method('renderWidget')
+            ->will($this->returnValue(new Response));
 
 
-        $formExtension = $this->getMock('Twig_ExtensionInterface', array('renderListElement', 'initRuntime', 'getTokenParsers', 'getNodeVisitors', 'getFilters', 'getTests', 'getFunctions', 'getOperators', 'getGlobals', 'getName', 'setTheme', 'renderWidget'));
+        $formExtension = $this->getMock('Twig_ExtensionInterface', array('renderListElement', 'initRuntime', 'getTokenParsers', 'getNodeVisitors', 'getFilters', 'getTests', 'getFunctions', 'getOperators', 'getGlobals', 'getName'));
         $formExtension->expects($this->once())->method('getName')->will($this->returnValue('form'));
         $formExtension->expects($this->once())->method('getName')->will($this->returnValue('form'));
-        $formExtension->expects($this->once())->method('renderWidget')->will($this->returnValue(new Response));
+        $formExtension->expects($this->never())->method('renderWidget');
         $formExtension->expects($this->never())->method('setTheme');
         $formExtension->expects($this->never())->method('setTheme');
         $formExtension->renderer = $mockRenderer;
         $formExtension->renderer = $mockRenderer;