Skip to content
Snippets Groups Projects
Commit 4624d846 authored by efalcy's avatar efalcy
Browse files

Modification du chemin vers les fichiers images pour import de generation du site

parent 1970cf7f
Branches
Tags
No related merge requests found
......@@ -30,7 +30,7 @@ class Class_FileWriter {
}
public function mkdir($directory_name) {
return mkdir($directory_name,0700,true);
return mkdir($directory_name,0777,true);
}
}
......
......@@ -117,15 +117,15 @@ class Class_ImportFichierGenerationSite {
public function getDefaultPath() {
return USERFILESURL.'image/';
return USERFILESPATH.'/image/';
}
protected function createDirectory($directory_name) {
public function createDirectory($directory_name) {
$file_writer = self::getFileWriter();
$cleaned_name=iconv('UTF-8','ASCII//TRANSLIT',$directory_name);
$cleaned_name=str_replace(' ','_',$cleaned_name);
echo $this->getDefaultPath().'/'.$cleaned_name;
echo $this->getDefaultPath().$cleaned_name;
$file_writer->mkdir($this->getDefaultPath().$cleaned_name);
return $cleaned_name;
}
......
......@@ -18,7 +18,7 @@
* along with AFI-OPAC 2.0; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
require_once('library/Class/ImportTxtFile.php');
require_once('library/Class/ImportFichierGenerationSite.php');
class ImportArboFormTxtFileReadProfilTest extends PHPUnit_Framework_TestCase {
protected $_importTxt;
protected $file_writer;
......@@ -190,13 +190,13 @@ class ImportArboFormTxtFileDirectoryCreationReadProfilTest extends PHPUnit_Frame
->whenCalled('save')
->answers(true);
$this->file_writer->whenCalled('mkdir')
->with('/Nature_et_loisirs/Sport')
->with($this->_importTxt->getDefaultPath().'Nature_et_loisirs/Sport')
->answers(true)
->whenCalled('mkdir')
->with('/Nature_et_loisirs/Jeux')
->with($this->_importTxt->getDefaultPath().'Nature_et_loisirs/Jeux')
->answers(true)
->whenCalled('mkdir')
->with('/Cinema/Series_tv')
->with($this->_importTxt->getDefaultPath().'Cinema/Series_tv')
->answers(true)
->beStrict();
/* $this->file_writer->whenCalled('mkdir')
......@@ -211,8 +211,8 @@ class ImportArboFormTxtFileDirectoryCreationReadProfilTest extends PHPUnit_Frame
/** @test */
public function importFileShouldCreateDirectoriesJeuxAndSportForProfilNatureEtLoisirs() {
$this->_importTxt->createDirectoriesForProfil($this->profils[0]);
$this->assertTrue($this->file_writer->methodHasBeenCalledWithParams('mkdir',['/Nature_et_loisirs/Jeux']));
$this->assertTrue($this->file_writer->methodHasBeenCalledWithParams('mkdir',['/Nature_et_loisirs/Sport']));
$this->assertTrue($this->file_writer->methodHasBeenCalledWithParams('mkdir',[$this->_importTxt->getDefaultPath().'Nature_et_loisirs/Jeux']));
$this->assertTrue($this->file_writer->methodHasBeenCalledWithParams('mkdir',[$this->_importTxt->getDefaultPath().'Nature_et_loisirs/Sport']));
}
......@@ -220,7 +220,7 @@ class ImportArboFormTxtFileDirectoryCreationReadProfilTest extends PHPUnit_Frame
/** @test */
public function importFileShouldCreateDirectorySeriesTvForProfilCinema() {
$this->_importTxt->createDirectoriesForProfil($this->profils[1]);
$this->assertTrue($this->file_writer->methodHasBeenCalledWithParams('mkdir',['/Cinema/Series_tv']));
$this->assertTrue($this->file_writer->methodHasBeenCalledWithParams('mkdir',[$this->_importTxt->getDefaultPath().'Cinema/Series_tv']));
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment