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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
	tests/classes/PhraseanetPHPUnitAbstract.php
This commit is contained in:
Nicolas Le Goff
2014-02-11 09:02:29 +01:00
parent 6d82521a67 aa914b4c13
commit 6053a03b87
7 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
View File

@@ -2104,7 +2104,11 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
$this->assertArrayHasKey("label", $permalink);
$this->assertInternalType(\PHPUnit_Framework_Constraint_IsType::TYPE_STRING, $permalink['label']);
$this->assertArrayHasKey("updated_on", $permalink);
$this->assertEquals($subdef->get_permalink()->get_last_modified()->format(DATE_ATOM), $permalink['updated_on']);
$expected = $subdef->get_permalink()->get_last_modified();
$found = \DateTime::createFromFormat(DATE_ATOM, $permalink['updated_on']);
$this->assertLessThanOrEqual(1, $expected->diff($found)->format('U'));
$this->assertInternalType(\PHPUnit_Framework_Constraint_IsType::TYPE_STRING, $permalink['updated_on']);
$this->assertDateAtom($permalink['updated_on']);
$this->assertArrayHasKey("page_url", $permalink);