Thomas Rabaix 13 gadi atpakaļ
vecāks
revīzija
1d244e6b2d

+ 0 - 1
Tests/Admin/BaseAdminModelManagerTest.php

@@ -26,7 +26,6 @@ class BaseAdminModelManagerTest extends \PHPUnit_Framework_TestCase
     public function testHook()
     {
         $securityHandler = $this->getMock('Sonata\AdminBundle\Security\Handler\SecurityHandlerInterface');
-        $securityHandler->expects($this->once())->method('createObjectOwner');
 
         $modelManager = $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface');
         $modelManager->expects($this->once())->method('create');

+ 10 - 9
Tests/Security/Handler/AclSecurityHandlerTest.php

@@ -12,6 +12,7 @@ namespace Sonata\AdminBundle\Tests\Admin\Security\Acl\Permission;
 
 use Sonata\AdminBundle\Security\Handler\AclSecurityHandler;
 use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException;
+use Sonata\AdminBundle\Security\Acl\Permission\MaskBuilder;
 
 class AclSecurityHandlerTest extends \PHPUnit_Framework_TestCase
 {
@@ -27,9 +28,9 @@ class AclSecurityHandlerTest extends \PHPUnit_Framework_TestCase
             ->method('isGranted')
             ->will($this->returnValue(true));
 
-        $aclProvider = $this->getMock('Symfony\Component\Security\Acl\Model\AclProviderInterface');
+        $aclProvider = $this->getMock('Symfony\Component\Security\Acl\Model\MutableAclProviderInterface');
 
-        $handler = new AclSecurityHandler($securityContext, $aclProvider, array());
+        $handler = new AclSecurityHandler($securityContext, $aclProvider, 'Sonata\AdminBundle\Security\Acl\Permission\MaskBuilder', array());
 
         $this->assertTrue($handler->isGranted($admin, array('TOTO')));
         $this->assertTrue($handler->isGranted($admin, 'TOTO'));
@@ -39,7 +40,7 @@ class AclSecurityHandlerTest extends \PHPUnit_Framework_TestCase
             ->method('isGranted')
             ->will($this->returnValue(false));
 
-        $handler = new AclSecurityHandler($securityContext, $aclProvider, array());
+        $handler = new AclSecurityHandler($securityContext, $aclProvider, 'Sonata\AdminBundle\Security\Acl\Permission\MaskBuilder', array());
 
         $this->assertFalse($handler->isGranted($admin, array('TOTO')));
         $this->assertFalse($handler->isGranted($admin, 'TOTO'));
@@ -61,9 +62,9 @@ class AclSecurityHandlerTest extends \PHPUnit_Framework_TestCase
             ->method('getSecurityInformation')
             ->will($this->returnValue($informations));
 
-        $aclProvider = $this->getMock('Symfony\Component\Security\Acl\Model\AclProviderInterface');
+        $aclProvider = $this->getMock('Symfony\Component\Security\Acl\Model\MutableAclProviderInterface');
 
-        $handler = new AclSecurityHandler($securityContext, $aclProvider, array());
+        $handler = new AclSecurityHandler($securityContext, $aclProvider, 'Sonata\AdminBundle\Security\Acl\Permission\MaskBuilder', array());
 
         $results = $handler->buildSecurityInformation($admin);
 
@@ -79,9 +80,9 @@ class AclSecurityHandlerTest extends \PHPUnit_Framework_TestCase
             ->method('isGranted')
             ->will($this->throwException(new AuthenticationCredentialsNotFoundException('FAIL')));
 
-        $aclProvider = $this->getMock('Symfony\Component\Security\Acl\Model\AclProviderInterface');
+        $aclProvider = $this->getMock('Symfony\Component\Security\Acl\Model\MutableAclProviderInterface');
 
-        $handler = new AclSecurityHandler($securityContext, $aclProvider, array());
+        $handler = new AclSecurityHandler($securityContext, $aclProvider, 'Sonata\AdminBundle\Security\Acl\Permission\MaskBuilder', array());
 
         $this->assertFalse($handler->isGranted($admin, 'raise exception', $admin));
     }
@@ -98,9 +99,9 @@ class AclSecurityHandlerTest extends \PHPUnit_Framework_TestCase
             ->method('isGranted')
             ->will($this->throwException(new \RunTimeException('FAIL')));
 
-        $aclProvider = $this->getMock('Symfony\Component\Security\Acl\Model\AclProviderInterface');
+        $aclProvider = $this->getMock('Symfony\Component\Security\Acl\Model\MutableAclProviderInterface');
 
-        $handler = new AclSecurityHandler($securityContext, $aclProvider, array());
+        $handler = new AclSecurityHandler($securityContext, $aclProvider, 'Sonata\AdminBundle\Security\Acl\Permission\MaskBuilder', array());
 
         $this->assertFalse($handler->isGranted($admin, 'raise exception', $admin));
     }