hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clean-boxes' into merge-clean-boxes

Browse Source
This commit is contained in:
Thibaud Fabre
2016-01-06 19:53:43 +01:00
parent e3f49db7b6 232b72269a
commit c92d5da9fe
56 changed files with 2546 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
View File

@@ -30,7 +30,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
self::$DI['app']['acl'] = new ACLProvider(self::$DI['app']);
foreach (self::$createdCollections as $collection) {
try {
$collection->unmount_collection(self::$DI['app']);
$collection->unmount();
} catch (\Exception $e) {
}
@@ -154,7 +154,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
$json = $this->getJson(self::$DI['client']->getResponse());
$this->assertTrue($json->success);
$collection = $collection = \collection::get_from_base_id(self::$DI['app'], self::$DI['collection']->get_base_id());
$collection = $collection = \collection::getByBaseId(self::$DI['app'], self::$DI['collection']->get_base_id());
$this->assertTrue( ! ! strrpos($collection->get_prefs(), 'my_new_value'));
unset($collection);
}
@@ -212,7 +212,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
$json = $this->getJson(self::$DI['client']->getResponse());
$this->assertTrue($json->success);
$collection = \collection::get_from_base_id(self::$DI['app'], self::$DI['collection']->get_base_id());
$collection = \collection::getByBaseId(self::$DI['app'], self::$DI['collection']->get_base_id());
$this->assertTrue($collection->is_active());
unset($collection);
}
@@ -252,7 +252,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
$json = $this->getJson(self::$DI['client']->getResponse());
$this->assertTrue($json->success);
$collection = \collection::get_from_base_id(self::$DI['app'], self::$DI['collection']->get_base_id());
$collection = \collection::getByBaseId(self::$DI['app'], self::$DI['collection']->get_base_id());
$this->assertFalse($collection->is_active());
unset($collection);
}
@@ -335,7 +335,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
$json = $this->getJson(self::$DI['client']->getResponse());
$this->assertTrue($json->success);
$collection = \collection::get_from_base_id(self::$DI['app'], self::$DI['collection']->get_base_id());
$collection = \collection::getByBaseId(self::$DI['app'], self::$DI['collection']->get_base_id());
$this->assertNotNull($collection->get_pub_wm());
unset($collection);
}
@@ -440,7 +440,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
$json = $this->getJson(self::$DI['client']->getResponse());
$this->assertTrue($json->success);
$this->assertEquals($collection->get_name(), 'test_rename_coll');
$collection->unmount_collection(self::$DI['app']);
$collection->unmount();
$collection->delete();
}
@@ -469,7 +469,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertEquals($collection->get_label('nl'), 'netherlands label');
$this->assertEquals($collection->get_label('fr'), 'label français');
$this->assertEquals($collection->get_label('en'), 'label à l\'anglaise');
$collection->unmount_collection(self::$DI['app']);
$collection->unmount();
$collection->delete();
}
@@ -832,7 +832,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
$json = $this->getJson(self::$DI['client']->getResponse());
$this->assertTrue($json->success);
try {
\collection::get_from_base_id(self::$DI['app'], $collection->get_base_id());
\collection::getByBaseId(self::$DI['app'], $collection->get_base_id());
$this->fail('Collection not deleted');
} catch (\Exception $e) {
@@ -902,7 +902,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertTrue($json->success);
try {
\collection::get_from_base_id(self::$DI['app'], $collection->get_base_id());
\collection::getByBaseId(self::$DI['app'], $collection->get_base_id());
$this->fail('Collection not unmounted');
} catch (\Exception_Databox_CollectionNotFound $e) {

4
tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php
View File

@@ -34,7 +34,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
foreach (self::$createdCollections as $collection) {
try {
$collection->unmount_collection(self::$DI['app']);
$collection->unmount();
} catch (\Exception $e) {
}
@@ -513,7 +513,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
$this->setAdmin(true);
$collection = $this->createOneCollection();
$collection->unmount_collection(self::$DI['app']);
$collection->unmount();
self::$DI['client']->request('POST', '/admin/databox/' . $collection->get_sbas_id() . '/collection/' . $collection->get_coll_id() . '/mount/', [
'othcollsel' => self::$DI['collection']->get_base_id()