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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/unitTestsTest.php
This commit is contained in:
Romain Neutron
2013-12-19 10:31:52 +01:00
parent 273612875f 7ee36ce3fa
commit ecf516406a
12 changed files with 128 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/classes/unitTestsTest.php
View File

@@ -11,6 +11,8 @@ class unitTestsTest extends \PhraseanetTestCase
"PhraseanetAuthenticatedTestCase.php",
"PhraseanetAuthenticatedWebTestCase.php",
"PhraseanetPHPUnitListener.php",
"PDOMock.php",
"CsrfTestProvider.php",
];
$testDir = __DIR__ . '/';