mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-12 12:33:26 +00:00
merge
This commit is contained in:
@@ -172,11 +172,18 @@ class Bridge_Application extends PhraseanetWebTestCaseAuthenticatedAbstract
|
||||
|
||||
public function testLogoutDeconnected()
|
||||
{
|
||||
try
|
||||
{
|
||||
$url = sprintf('/bridge/adapter/%d/logout/', self::$account->get_id());
|
||||
$crawler = $this->client->request('GET', $url);
|
||||
$pageContent = $this->client->getResponse()->getContent();
|
||||
$this->assertContains("/adapter/" . self::$account->get_id() . "/logout/", $pageContent);
|
||||
$this->deconnected($crawler, $pageContent);
|
||||
}
|
||||
catch(Exception $e)
|
||||
{
|
||||
exit($e);
|
||||
}
|
||||
}
|
||||
|
||||
public function testLogout()
|
||||
|
@@ -337,6 +337,11 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
|
||||
protected static $collection;
|
||||
protected static $time_start;
|
||||
protected static $generated_subdefs = array();
|
||||
|
||||
/**
|
||||
*
|
||||
* @var \Alchemy\Phrasea\Core
|
||||
*/
|
||||
protected static $core;
|
||||
|
||||
public static function setUpBeforeClass()
|
||||
@@ -959,4 +964,4 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
|
||||
$browser->setUserAgent($user_agent);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@@ -22,7 +22,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
|
||||
{
|
||||
parent::setUp();
|
||||
$appbox = appbox::get_instance();
|
||||
$this->object = new API_V1_adapter(FALSE, $appbox);
|
||||
$this->object = new API_V1_adapter(FALSE, $appbox, self::$core);
|
||||
}
|
||||
|
||||
public function testGet_error_code()
|
||||
@@ -370,10 +370,16 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
|
||||
$appbox = appbox::get_instance();
|
||||
$session = $appbox->get_session();
|
||||
$usr_id = $session->get_usr_id();
|
||||
|
||||
$em = self::$core->getEntityManager();
|
||||
$repo = $em->getRepository('\Entities\Basket');
|
||||
|
||||
/* @var $repo \Repositories\BasketRepository */
|
||||
$repo->findUserBasket($ssel_id, self::$core->getAuthenticatedUser());
|
||||
|
||||
$basket = basket_adapter::getInstance(appbox::get_instance(), $ssel_id, $usr_id);
|
||||
$this->assertTrue($basket instanceof basket_adapter);
|
||||
$basket->delete();
|
||||
$this->assertTrue($basket instanceof \Entities\Basket);
|
||||
$em->remove($Basket);
|
||||
$em->flush();
|
||||
}
|
||||
|
||||
public function testDelete_basket()
|
||||
@@ -381,8 +387,17 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
|
||||
$appbox = appbox::get_instance();
|
||||
$usr_id = $appbox->get_session()->get_usr_id();
|
||||
$user = User_Adapter::getInstance($usr_id, $appbox);
|
||||
$basket = basket_adapter::create($appbox, 'test suppression', $user);
|
||||
$ssel_id = $basket->get_ssel_id();
|
||||
|
||||
$em = self::$core->getEntityManager();
|
||||
|
||||
$Basket = new Entities\Basket();
|
||||
$Basket->setName('Delete test');
|
||||
$Basket->setOwner($user);
|
||||
|
||||
$em->persist($Basket);
|
||||
$em->flush();
|
||||
|
||||
$ssel_id = $basket->getId();
|
||||
|
||||
$request = new Request(array(), array(), array(), array(), array(), array('HTTP_Accept' => 'application/json'));
|
||||
$result = $this->object->delete_basket($request, $ssel_id);
|
||||
@@ -390,12 +405,14 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
|
||||
$this->assertEquals('application/json', $result->get_content_type());
|
||||
$this->assertTrue(is_object(json_decode($result->format())));
|
||||
|
||||
$repo = $em->getRepository('\Entities\Basket');
|
||||
|
||||
try
|
||||
{
|
||||
basket_adapter::getInstance($appbox, $ssel_id, $usr_id);
|
||||
$repo->findUserBasket($ssel_id, $user);
|
||||
$this->fail('An exception should have been raised');
|
||||
}
|
||||
catch (Exception_Basket_NotFound $e)
|
||||
catch (Exception_NotFound $e)
|
||||
{
|
||||
|
||||
}
|
||||
|
@@ -246,7 +246,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
|
||||
$this->assertTrue((strlen($metadatas->separator) > 0));
|
||||
|
||||
$this->assertTrue(is_string($metadatas->thesaurus_branch));
|
||||
$this->assertTrue(in_array($metadatas->type, array(databox_field::TYPE_DATE, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
|
||||
$this->assertTrue(in_array($metadatas->type, array(databox_field::TYPE_DATE,databox_field::TYPE_STRING, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
|
||||
$this->assertTrue(is_bool($metadatas->indexable));
|
||||
$this->assertTrue(is_bool($metadatas->multivalue));
|
||||
$this->assertTrue(is_bool($metadatas->readonly));
|
||||
|
@@ -254,7 +254,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
|
||||
$this->assertTrue((strlen($metadatas["separator"]) > 0));
|
||||
|
||||
$this->assertTrue(is_string($metadatas["thesaurus_branch"]));
|
||||
$this->assertTrue(in_array($metadatas["type"], array(databox_field::TYPE_DATE, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
|
||||
$this->assertTrue(in_array($metadatas["type"], array(databox_field::TYPE_DATE,databox_field::TYPE_STRING, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
|
||||
$this->assertTrue(is_bool($metadatas["indexable"]));
|
||||
$this->assertTrue(is_bool($metadatas["multivalue"]));
|
||||
$this->assertTrue(is_bool($metadatas["readonly"]));
|
||||
|
@@ -478,10 +478,9 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
|
||||
$baskets = $baskets['baskets'];
|
||||
|
||||
$basket = array_shift($baskets);
|
||||
$this->assertInstanceOf('basket_adapter', $basket);
|
||||
$this->assertInstanceOf('\Entities\Basket', $basket);
|
||||
|
||||
$basket->push_element(self::$record_1, false, false);
|
||||
self::$record_1->get_container_baskets();
|
||||
|
||||
$found = $sselcont_id = false;
|
||||
|
||||
@@ -490,13 +489,13 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
|
||||
|
||||
foreach (self::$record_1->get_container_baskets() as $c_basket)
|
||||
{
|
||||
if ($c_basket->get_ssel_id() == $basket->get_ssel_id())
|
||||
if ($c_basket->getId() == $basket->get_ssel_id())
|
||||
{
|
||||
$found = true;
|
||||
foreach ($c_basket->get_elements() as $b_el)
|
||||
foreach ($c_basket->getElements() as $b_el)
|
||||
{
|
||||
if ($b_el->get_record()->get_record_id() == $record_id && $b_el->get_record()->get_sbas_id() == $sbas_id)
|
||||
$sselcont_id = $b_el->get_sselcont_id();
|
||||
if ($b_el->getRecord()->get_record_id() == $record_id && $b_el->getRecord()->get_sbas_id() == $sbas_id)
|
||||
$sselcont_id = $b_el->getId();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -37,12 +37,22 @@ class userTest extends PhraseanetPHPUnitAbstract
|
||||
$this->assertFalse(User_Adapter::get_usr_id_from_email(null));
|
||||
self::$user->set_email('');
|
||||
$this->assertFalse(User_Adapter::get_usr_id_from_email(null));
|
||||
self::$user->set_email('noonealt1@example.com');
|
||||
$this->assertEquals(self::$user->get_id(), User_Adapter::get_usr_id_from_email('noonealt1@example.com'));
|
||||
self::$user->set_email('noone@example.com');
|
||||
$this->assertEquals(self::$user->get_id(), User_Adapter::get_usr_id_from_email('noone@example.com'));
|
||||
}
|
||||
catch(Exception $e)
|
||||
{
|
||||
$this->fail($e->getMessage());
|
||||
}
|
||||
try
|
||||
{
|
||||
|
||||
self::$user->set_email('noonealt1@example.com');
|
||||
$this->fail('A user already got this address');
|
||||
}
|
||||
catch(Exception $e)
|
||||
{
|
||||
|
||||
}
|
||||
$this->assertFalse(User_Adapter::get_usr_id_from_email(null));
|
||||
}
|
||||
|
Reference in New Issue
Block a user