Переглянути джерело

uncomment part of old test case

Oskar Stark 8 роки тому
батько
коміт
66779e5bd8

+ 12 - 14
Tests/Command/ExplainAdminCommandTest.php

@@ -226,13 +226,11 @@ class ExplainAdminCommandTest extends \PHPUnit_Framework_TestCase
             ->method('getModelManager')
             ->will($this->returnValue($modelManager));
 
-        // @todo Mock of \Traversable is available since Phpunit 3.8. This should be completed after stable release of Phpunit 3.8.
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/103
-        // $formBuilder = $this->getMock('Symfony\Component\Form\FormBuilderInterface');
-        //
-        // $this->admin->expects($this->any())
-        //     ->method('getFormBuilder')
-        //     ->will($this->returnValue($formBuilder));
+        $formBuilder = $this->getMock('Symfony\Component\Form\FormBuilderInterface');
+
+        $this->admin->expects($this->any())
+             ->method('getFormBuilder')
+             ->will($this->returnValue($formBuilder));
 
         $datagridBuilder = $this->getMock('\Sonata\AdminBundle\Builder\DatagridBuilderInterface');
 
@@ -254,6 +252,7 @@ class ExplainAdminCommandTest extends \PHPUnit_Framework_TestCase
             str_replace("\n", PHP_EOL, file_get_contents(__DIR__.'/../Fixtures/Command/explain_admin.txt')),
             get_class($this->admin),
             get_class($modelManager),
+            get_class($formBuilder),
             get_class($datagridBuilder),
             get_class($listBuilder)
         ), $commandTester->getDisplay());
@@ -281,13 +280,11 @@ class ExplainAdminCommandTest extends \PHPUnit_Framework_TestCase
             ->method('getModelManager')
             ->will($this->returnValue($modelManager));
 
-        // @todo Mock of \Traversable is available since Phpunit 3.8. This should be completed after stable release of Phpunit 3.8.
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/103
-        // $formBuilder = $this->getMock('Symfony\Component\Form\FormBuilderInterface');
-        //
-        // $this->admin->expects($this->any())
-        //     ->method('getFormBuilder')
-        //     ->will($this->returnValue($formBuilder));
+        $formBuilder = $this->getMock('Symfony\Component\Form\FormBuilderInterface');
+
+        $this->admin->expects($this->any())
+             ->method('getFormBuilder')
+             ->will($this->returnValue($formBuilder));
 
         $datagridBuilder = $this->getMock('\Sonata\AdminBundle\Builder\DatagridBuilderInterface');
 
@@ -313,6 +310,7 @@ class ExplainAdminCommandTest extends \PHPUnit_Framework_TestCase
             ),
             get_class($this->admin),
             get_class($modelManager),
+            get_class($formBuilder),
             get_class($datagridBuilder),
             get_class($listBuilder)
         ), $commandTester->getDisplay());

+ 3 - 3
Tests/Fixtures/Command/explain_admin.txt

@@ -4,9 +4,9 @@ Admin                : %1$s
 Model                : Acme\Entity\Foo
 Controller           : SonataAdminBundle:CRUD
 Model Manager        : %2$s
-Form Builder         : Sonata\AdminBundle\Command\ExplainAdminCommand
-Datagrid Builder     : %3$s
-List Builder         : %4$s
+Form Builder         : %3$s
+Datagrid Builder     : %4$s
+List Builder         : %5$s
 Parent          : foo_child
 
 Routes

+ 3 - 3
Tests/Fixtures/Command/explain_admin_empty_validator.txt

@@ -4,9 +4,9 @@ Admin                : %1$s
 Model                : Acme\Entity\Foo
 Controller           : SonataAdminBundle:CRUD
 Model Manager        : %2$s
-Form Builder         : Sonata\AdminBundle\Command\ExplainAdminCommand
-Datagrid Builder     : %3$s
-List Builder         : %4$s
+Form Builder         : %3$s
+Datagrid Builder     : %4$s
+List Builder         : %5$s
 Parent          : foo_child
 
 Routes