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

Fix Test

Browse Source 
modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
This commit is contained in:
Benjamin Perche
2014-07-04 14:49:35 +02:00
parent 169e236588
commit d82ca5d767
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
View File

@@ -606,11 +606,15 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
public function testBuildArchiveResponse() public function testBuildArchiveResponse()
{ {
$loadedArchiveResponse = $this->loadedZip $loadedArchiveResponse = $this->loadedZip
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
->buildArchiveResponse("test") ->buildArchiveResponse("test")
======= =======
->buildArchiveResponse() ->buildArchiveResponse()
>>>>>>> Define archive builders and formatters >>>>>>> Define archive builders and formatters
=======
->buildArchiveResponse("test")
>>>>>>> Fix Test
; ;
$loadedArchiveResponseContent = $loadedArchiveResponse->getContent(); $loadedArchiveResponseContent = $loadedArchiveResponse->getContent();