This commit is contained in:
Romain Neutron
2013-05-29 21:29:40 +02:00
parent 278eb3c2dc
commit 91185e6f3c
30 changed files with 65 additions and 102 deletions

View File

@@ -40,7 +40,6 @@ class ACLTest extends PhraseanetPHPUnitAuthenticatedAbstract
self::$DI['user']->ACL()->revoke_access_from_bases(array(self::$DI['collection_no_access']->get_base_id()));
self::$DI['user']->ACL()->set_masks_on_base(self::$DI['collection_no_access_by_status']->get_base_id(), '0000000000000000000000000000000000000000000000000001000000000000', '0000000000000000000000000000000000000000000000000001000000000000', '0000000000000000000000000000000000000000000000000001000000000000', '0000000000000000000000000000000000000000000000000001000000000000');
parent::tearDownAfterClass();
}
@@ -232,7 +231,6 @@ class ACLTest extends PhraseanetPHPUnitAuthenticatedAbstract
, 'canaddrecord' => true
);
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$base_id = $collection->get_base_id();
@@ -276,7 +274,7 @@ class ACLTest extends PhraseanetPHPUnitAuthenticatedAbstract
foreach ($appbox->get_databoxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
$bid = $collection->get_base_id();
if(!$acl->has_access_to_base($bid)) {
if (!$acl->has_access_to_base($bid)) {
$acl->give_access_to_base(array($bid));
}
$acl->set_order_master($collection, true);
@@ -344,12 +342,10 @@ class ACLTest extends PhraseanetPHPUnitAuthenticatedAbstract
public function testHas_right()
{
$rights = array(
'bas_modify_struct' => true
);
$this->assertFalse(self::$DI['user']->ACL()->has_right('bas_modify_struct'));
$this->assertFalse(self::$DI['user']->ACL()->has_right('bas_modif_th'));
@@ -380,7 +376,6 @@ class ACLTest extends PhraseanetPHPUnitAuthenticatedAbstract
, 'bas_modif_th' => true
);
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
self::$DI['user']->ACL()->give_access_to_sbas(array($databox->get_sbas_id()));
self::$DI['user']->ACL()->update_rights_to_sbas($databox->get_sbas_id(), $rights_false);
@@ -460,7 +455,6 @@ class ACLTest extends PhraseanetPHPUnitAuthenticatedAbstract
$this->assertEquals(count($base_ids), count($bases));
$sql = 'SELECT actif FROM basusr WHERE usr_id = :usr_id AND base_id = :base_id';
$stmt = self::$DI['app']['phraseanet.appbox']->get_connection()->prepare($sql);
@@ -599,7 +593,6 @@ class ACLTest extends PhraseanetPHPUnitAuthenticatedAbstract
$this->assertTrue(self::$DI['user']->ACL()->has_access_to_module('thesaurus'));
$this->assertFalse(self::$DI['user']->ACL()->has_access_to_module('upload'));
$found = false;
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
foreach ($databox->get_collections() as $collection) {