Merge pull request sonata-project#2974 from sonata-project/pulzarraid…

…er-patch-1 Fixed unit tests in CRUDControllerTest
BacLuc · May 6, 2015 · 1081aaa · 1081aaa
2 parents 9807b04 + 4ef3171
commit 1081aaa
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/Tests/Controller/CRUDControllerTest.php b/Tests/Controller/CRUDControllerTest.php
@@ -1612,6 +1612,10 @@ public function testEditActionWithModelManagerException($expectedToStringValue,
             ->with($this->equalTo('EDIT'))
             ->will($this->returnValue(true));
 
+        $this->admin->expects($this->any())
+            ->method('getClass')
+            ->will($this->returnValue('stdClass'));
+
         $form = $this->getMockBuilder('Symfony\Component\Form\Form')
             ->disableOriginalConstructor()
             ->getMock();
@@ -1631,6 +1635,9 @@ public function testEditActionWithModelManagerException($expectedToStringValue,
 
         $this->expectTranslate('flash_edit_error', array('%name%' => $expectedToStringValue), 'SonataAdminBundle');
 
+        $form->expects($this->once())
+            ->method('isSubmitted')
+            ->will($this->returnValue(true));
         $this->request->setMethod('POST');
 
         $formView = $this->getMock('Symfony\Component\Form\FormView');
@@ -1732,6 +1739,10 @@ public function testPreCreate()
             ->with($this->equalTo('CREATE'))
             ->will($this->returnValue(true));
 
+        $this->admin->expects($this->any())
+            ->method('getClass')
+            ->will($this->returnValue('stdClass'));
+
         $this->admin->expects($this->once())
             ->method('getNewInstance')
             ->will($this->returnValue($object));
@@ -1977,6 +1988,10 @@ public function testCreateActionWithModelManagerException($expectedToStringValue
             ->with($this->equalTo('CREATE'))
             ->will($this->returnValue(true));
 
+        $this->admin->expects($this->any())
+            ->method('getClass')
+            ->will($this->returnValue('stdClass'));
+
         $object = new \stdClass();
 
         $this->admin->expects($this->once())
@@ -2002,6 +2017,10 @@ public function testCreateActionWithModelManagerException($expectedToStringValue
 
         $this->expectTranslate('flash_create_error', array('%name%' => $expectedToStringValue), 'SonataAdminBundle');
 
+        $form->expects($this->once())
+            ->method('isSubmitted')
+            ->will($this->returnValue(true));
+
         $this->request->setMethod('POST');
 
         $formView = $this->getMock('Symfony\Component\Form\FormView');