TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tax

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-27 11:06:16 +02:00
parent 622e1ca3b6 ab6e34cf00
commit 7b3e7ece4d
6 changed files with 117 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Tests/Tools/FileManagerTest.php
View File

@@ -532,9 +532,9 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase {
->getMock();
$fileManager = new FileManager($stubContainer);
$badFileName = 'azeéràçè§^"$*+-_°)(&é<>@#ty';
$badFileName = 'a/ze\érà~çè§^"$*+-_°)(&é<>@#ty2/[\/:*?"<>|]/fi?.fUPPERile.exel../e*';
$expected = 'azeyryZyy-_yty';
$expected = 'azer-_ty2fi.fupperile.exel..e';
$actual = $fileManager->sanitizeFileName($badFileName);
$this->assertEquals($expected, $actual);
@@ -802,7 +802,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase {
$fileManager = new FileManager($stubContainer);
$expected = 'or1-g_nalyfilenme-1.yml';
$expected = 'or1-g_nalfilenme-1.yml';
$actual = $fileManager->renameFile(1, $stubUploadedFile);
$this->assertEquals($expected, $actual);
@@ -830,7 +830,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase {
$fileManager = new FileManager($stubContainer);
$expected = 'or1-g_nalyfilenme-1';
$expected = 'or1-g_nalfilenme-1';
$actual = $fileManager->renameFile(1, $stubUploadedFile);
$this->assertEquals($expected, $actual);