diff --git a/VERSIONS_WIP/42624 b/VERSIONS_WIP/42624
new file mode 100644
index 0000000000000000000000000000000000000000..bb514f8ba35b148413e808099582d1c19d2ebba6
--- /dev/null
+++ b/VERSIONS_WIP/42624
@@ -0,0 +1 @@
+ - ticket #42624 : bouton mettre à jour la skin
\ No newline at end of file
diff --git a/application/modules/admin/controllers/IndexController.php b/application/modules/admin/controllers/IndexController.php
index 24e69813652d860e5e53952add61395696d95459..065a2073f5d158a2b4ac4ef4596013f1cbf545f9 100644
--- a/application/modules/admin/controllers/IndexController.php
+++ b/application/modules/admin/controllers/IndexController.php
@@ -112,4 +112,24 @@ class Admin_IndexController extends ZendAfi_Controller_Action {
public function heartbeatAction() {
$this->getHelper('ViewRenderer')->setNoRender();
}
+
+
+ public function updateSkinAction() {
+ $this->view->titre = $this->_('Mise à jour de la charte graphique');
+ $reader = new Class_Profil_SkinUpdateReader();
+ $this->view->reader = $reader;
+
+ if('pull' === $this->_getParam('git'))
+ $this->_askGitPull($reader);
+ }
+
+
+ protected function _askGitPull($reader) {
+ $message = $reader->askGitPull()
+ ? $this->_('La demande de mise à jour a été envoyée au serveur')
+ : $this->_('Erreur : La demande de mise à jour n\'a pas pu être envoyée au serveur');
+
+ $this->_helper->notify($message);
+ $this->_redirect('admin/index/update-skin');
+ }
}
\ No newline at end of file
diff --git a/application/modules/admin/views/scripts/index/update-skin.phtml b/application/modules/admin/views/scripts/index/update-skin.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..3ca70293117e5685c8a51c5c7a590ba0def8853d
--- /dev/null
+++ b/application/modules/admin/views/scripts/index/update-skin.phtml
@@ -0,0 +1,3 @@
+<?php
+echo $this->Admin_UpdateSkins($this->reader);
+?>
diff --git a/cosmogramme/php/classes/classe_cosmopaths.php b/cosmogramme/php/classes/classe_cosmopaths.php
index a8f5fd18580f06e4a4698afdc101b2902db58882..d06372cb4280c52dda3eb01300838c5d27ecbb0a 100644
--- a/cosmogramme/php/classes/classe_cosmopaths.php
+++ b/cosmogramme/php/classes/classe_cosmopaths.php
@@ -49,6 +49,7 @@ class CosmoPaths {
public function getFilesystem() {
+ require_once(realpath(dirname(__FILE__)).'/../../../library/Class/Testing/Abstract.php');
require_once(realpath(dirname(__FILE__)).'/../../../library/Class/Testing/FileSystem.php');
return null == $this->_filesystem
? new Class_Testing_FileSystem()
diff --git a/library/Class/Profil.php b/library/Class/Profil.php
index c1d9ebea09666258df23d38cff05f1d42f07eb95..4f83b9a60ed7fe5911febea4396a8bfdc5219adf 100644
--- a/library/Class/Profil.php
+++ b/library/Class/Profil.php
@@ -1149,6 +1149,11 @@ class Class_Profil extends Storm_Model_Abstract {
}
+ public function getUpdatableSkins() {
+ return $this->_getSkin()->getUpdatables();
+ }
+
+
/**
* Si un attribut n'est pas trouvé, regarde s'il n'est pas dans cfgSite.
* Permet de faire abstraction de CfgSite quand on va chercher les parametres
@@ -2005,6 +2010,11 @@ class Class_Profil extends Storm_Model_Abstract {
}
+ public function getExtraPath() {
+ return $this->_getSkin()->getExtraPath();
+ }
+
+
public function topProfilsDoAndSave($closure) {
$profils = $this->getLoader()->findAllBy(['where'=> 'parent_id is null']);
foreach ($profils as $profil) {
diff --git a/library/Class/Profil/Skin.php b/library/Class/Profil/Skin.php
index 5361066e6a56e246aefbf2188a8b1144eac850f6..08493d43ccbc5fa732b3d0504240d48b62429381 100644
--- a/library/Class/Profil/Skin.php
+++ b/library/Class/Profil/Skin.php
@@ -68,7 +68,7 @@ class Class_Profil_Skin {
}
- protected function getExtraPath() {
+ public function getExtraPath() {
if (!$admin_var = Class_AdminVar::get('EXTRA_SKIN_PATH'))
return self::EXTRA_PATH;
return self::EXTRA_PATH . $admin_var . ('/' !== substr($admin_var, -1) ? '/' : '');
@@ -117,8 +117,18 @@ class Class_Profil_Skin {
public function getAvailables() {
+ return $this->_getSkinsFrom([self::DEFAULT_PATH, $this->getExtraPath()]);
+ }
+
+
+ public function getUpdatables() {
+ return $this->_getSkinsFrom([$this->getExtraPath()]);
+ }
+
+
+ protected function _getSkinsFrom($paths) {
$skins = [];
- foreach ([self::DEFAULT_PATH, $this->getExtraPath()] as $path)
+ foreach($paths as $path)
$skins = array_merge($skins, $this->getAvailablesIn('.' . $path));
return $skins;
}
diff --git a/library/Class/Profil/SkinUpdateReader.php b/library/Class/Profil/SkinUpdateReader.php
new file mode 100644
index 0000000000000000000000000000000000000000..fec8797b4b0d8a31771cba1c5b32ea1a3c063c56
--- /dev/null
+++ b/library/Class/Profil/SkinUpdateReader.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_Profil_SkinUpdateReader {
+ use Trait_StaticFileWriter,
+ Trait_Translator,
+ Trait_TimeSource,
+ Trait_StaticCommand;
+
+ public static $skins_update_log = 'skins_update_log.json',
+ $command = 'git pull --rebase';
+
+
+ public static function getLogPath() {
+ return PATH_TEMP . static::$skins_update_log;
+ }
+
+
+ public static function getSkinsPath($folder) {
+ return ROOT_PATH . (new Class_Profil())->getExtraPath() . $folder;
+ }
+
+
+ public function askGitPull() {
+ $data = [];
+ foreach($this->getUpdatableSkins() as $skin)
+ $data[$skin->getLabel()] = ['Status' => $this->_('En attente depuis le %s', static::getCurrentDateTime())];
+
+ return $this->_writeInLog($data, true);
+ }
+
+
+ public function runGitPull() {
+ if(!$this->_shouldRun())
+ return $this->_('Aucune demande d\'exécution de la commande "%s" trouvée dans le fichier "%s"', static::$command, static::$skins_update_log);
+
+ $data = [];
+ foreach($this->getUpdatableSkins() as $skin) {
+ $data[$skin->getLabel()] = ['Status' => $this->_runGitPullIn($skin->getLabel())];
+ }
+
+ return $this->_writeInLog($data, false);
+ }
+
+
+ public function getJson() {
+ return json_decode($this->getFileWriter()->getContents(static::getLogPath()), true);
+ }
+
+
+ public function getStatus($folder) {
+ if(!$folder || !($json = $this->getJson()))
+ return '';
+
+ if(!isset($json[$folder]))
+ return '';
+
+ return $json[$folder]['Status'];
+ }
+
+
+ public function getUpdatableSkins() {
+ $skins = [];
+ foreach((new Class_Profil())->getUpdatableSkins() as $skin_label)
+ $skins[] = (new Class_Entity())->updateAttributes(['Label' => $skin_label,
+ 'Status' => $this->getStatus($skin_label)]);
+ return $skins;
+ }
+
+
+ protected function _runGitPullIn($folder) {
+ $commands = ['cd ' . static::getSkinsPath($folder) . ' 2>&1',
+ static::$command . ' 2>&1',
+ 'cd ' . ROOT_PATH . ' 2>&1'];
+
+ $command = implode(' && ', $commands);
+
+ $runner = $this->getCommand();
+ $runner->exec($command);
+
+ $output = '<br>' . implode('<br>', $runner->getOutput());
+
+ if(0 !== $runner->getReturnVar())
+ return $this->_('La commande %s a échoué : %s', $command, $output);
+
+ return static::getCurrentDateTime() . $output;
+ }
+
+
+ protected function _writeInLog($data, $should_run) {
+ $data['should_run'] = $should_run;
+ return static::getFileWriter()->putContents(static::getLogPath(), json_encode($data));
+ }
+
+
+ protected function _shouldRun() {
+ return $this->getJson()['should_run'];
+ }
+}
+?>
\ No newline at end of file
diff --git a/library/Class/Testing/Abstract.php b/library/Class/Testing/Abstract.php
new file mode 100644
index 0000000000000000000000000000000000000000..d6c2f4a9067a191a668c2844007f0e8016ef9f62
--- /dev/null
+++ b/library/Class/Testing/Abstract.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+abstract class Class_Testing_Abstract {
+ protected $_known_functions,
+ $_error = 'Call to unknown command method ';
+
+ public function __call($name, $args) {
+ if (!in_array($name, $this->_known_functions))
+ throw new RuntimeException($this->_error . $name);
+ return @call_user_func_array($name, $args);
+ }
+}
+?>
\ No newline at end of file
diff --git a/library/Class/Testing/Command.php b/library/Class/Testing/Command.php
new file mode 100644
index 0000000000000000000000000000000000000000..343a6e5ebf56a31fbed2fee8c54e552974d2c696
--- /dev/null
+++ b/library/Class/Testing/Command.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_Testing_Command extends Class_Testing_Abstract {
+ protected $_output,
+ $_return_var;
+
+
+ public function exec($command) {
+ $output = [];
+ $return_var = '';
+ $result = exec($command, $output, $return_var);
+ $this->_output = $output;
+ $this->_return_var = $return_var;
+ return $result;
+ }
+
+
+ public function getOutput() {
+ return $this->_output;
+ }
+
+
+ public function getReturnVar() {
+ return $this->_return_var;
+ }
+}
+?>
\ No newline at end of file
diff --git a/library/Class/Testing/FileSystem.php b/library/Class/Testing/FileSystem.php
index 5f7a756a1eda8492047a59eb388a8974e87af5d1..7ea1a4158091b6c423fcd98b8cc0851ead34bc61 100644
--- a/library/Class/Testing/FileSystem.php
+++ b/library/Class/Testing/FileSystem.php
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-class Class_Testing_FileSystem {
+class Class_Testing_FileSystem extends Class_Testing_Abstract {
protected $_known_functions =
[
'rmdir', 'unlink', 'fopen', 'fseek', 'fgets',
@@ -28,13 +28,7 @@ class Class_Testing_FileSystem {
'opendir', 'readdir', 'closedir', 'mkdir', 'glob', 'file', 'fwrite','rename',
'getimagesize', 'file_get_contents', 'sha1_file', 'is_file', 'pathinfo',
'is_readable'
- ];
-
-
- public function __call($name, $args) {
- if (!in_array($name, $this->_known_functions))
- throw new RuntimeException('Call to unknown fileSystem method ' . $name);
- return @call_user_func_array($name, $args);
- }
+ ],
+ $_error = 'Call to unknown fileSystem method ';
}
?>
\ No newline at end of file
diff --git a/library/Trait/StaticCommand.php b/library/Trait/StaticCommand.php
new file mode 100644
index 0000000000000000000000000000000000000000..25591bca06cb07c5f20ff467733cab586cf9b940
--- /dev/null
+++ b/library/Trait/StaticCommand.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+trait Trait_StaticCommand {
+ protected static $_command;
+
+ public static function setCommand($command) {
+ self::$_command = $command;
+ }
+
+
+ public static function getCommand() {
+ if (null !== self::$_command)
+ return self::$_command;
+ return new Class_Testing_Command();
+ }
+}
+?>
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
index 43ab70345ab7b11a0fd729af3b1e8df85d0c73d4..7dee1952e3e46b8b7e58feef32bf051e752cbe37 100644
--- a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
+++ b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
@@ -186,6 +186,10 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdmin extends ZendAfi_View_Helper_Base
.$this->addMenu("translations", $this->translate()->_("Traductions"), "/admin/i18n",
Class_AdminVar::isTranslationEnabled()
&& $this->filterAdmin($this->user))
+ .$this->addMenu("batches",
+ $this->translate()->_('Mise à jour de la charte graphique'),
+ '/admin/index/update-skin',
+ $this->filterAdminPortail($this->user))
.$this->closeBoite();
}
diff --git a/library/ZendAfi/View/Helper/Admin/UpdateSkins.php b/library/ZendAfi/View/Helper/Admin/UpdateSkins.php
new file mode 100644
index 0000000000000000000000000000000000000000..e49f8e4c34c564d7ce512b5e8847c701b0e408f5
--- /dev/null
+++ b/library/ZendAfi/View/Helper/Admin/UpdateSkins.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class ZendAfi_View_Helper_Admin_UpdateSkins extends ZendAfi_View_Helper_BaseHelper {
+
+ public function Admin_UpdateSkins($reader) {
+ $skins = $reader->getUpdatableSkins();
+ if(empty($skins)) {
+ return $this->_('Vous n\'avez pas de charte graphique d\'installée dans Bokeh');
+ }
+
+ $html =
+ $this->_tag('p', $this->_('Cette fonctionnalité nécessite la mise en place d\'une tâche plannifiée sur le serveur d\'hébergement pour fonctionner.'))
+ . $this->view->bouton('id=789789',
+ 'picto=add',
+ 'texte=' . $this->_('Demander la mise à jour'),
+ 'url=' . $this->view->url(['git' => 'pull']),
+ 'largeur=initial');
+
+ $lis = '';
+ foreach($skins as $skin)
+ $lis .= $this->_tag('li', $this->_renderSkin($skin));
+
+ $html .= $this->_tag('ul', $lis);
+ return $html;
+ }
+
+
+ protected function _renderSkin($skin) {
+ $header = $this->_tag('h2', $this->_('Thème %s', $skin->getLabel()));
+
+ $update_time = ($update_time = $skin->getStatus())
+ ? $update_time
+ : $this->_('inconnu');
+
+ $definitions = $this->_tag('dt', $this->_('Statut : '))
+ . $this->_tag('dd', $update_time);
+
+ $content = $this->_tag('dl', $definitions);
+ return $header . $content;
+ }
+}
+?>
\ No newline at end of file
diff --git a/scripts/update_skins.php b/scripts/update_skins.php
new file mode 100644
index 0000000000000000000000000000000000000000..f2a73112a9848d0477f85dcfc97a22c52a8d0436
--- /dev/null
+++ b/scripts/update_skins.php
@@ -0,0 +1,4 @@
+<?php
+require('console.php');
+return (new Class_Profil_SkinUpdateReader())->runGitPull();
+?>
\ No newline at end of file
diff --git a/tests/application/modules/admin/controllers/IndexControllerUpdateSkinTest.php b/tests/application/modules/admin/controllers/IndexControllerUpdateSkinTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..91c117561956ac0adab3c734f46856e11a7d95a8
--- /dev/null
+++ b/tests/application/modules/admin/controllers/IndexControllerUpdateSkinTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+abstract class IndexControllerUpdateSkinTestCase extends Admin_AbstractControllerTestCase {
+ public function setUp() {
+ parent::setUp();
+
+ $file_system = (new Storm_FileSystem_Volatile())
+ ->mkdir(Class_Profil_Skin::EXTRA_PATH . 'Valence');
+
+ Class_Profil_Skin::setFileSystem($file_system);
+
+ $time_source = new TimeSourceForTest('2016-05-02 12:30:00');
+ Class_Profil_SkinUpdateReader::setTimeSource($time_source);
+
+ $file_writer = $this->mock();
+ Class_Profil_SkinUpdateReader::setFileWriter($file_writer);
+
+ $file_writer
+ ->whenCalled('getContents')
+ ->with(Class_Profil_SkinUpdateReader::getLogPath())
+ ->answers(json_encode(['Valence' => ['Status' => '25/04/2016 15:01:37']]))
+
+ ->whenCalled('putContents')
+ ->with(Class_Profil_SkinUpdateReader::getLogPath(),
+ '{"Valence":{"Status":"En attente depuis le 2016-05-02 12:30:00"},"should_run":true}')
+ ->answers(true)
+
+ ->beStrict();
+ }
+}
+
+
+
+
+class IndexControllerUpdateSkinDispatchTest extends IndexControllerUpdateSkinTestCase {
+ public function setUp() {
+ parent::setUp();
+ $this->dispatch('admin/index/update-skin', true);
+ }
+
+
+ /** @test */
+ public function titleShouldBeMiseAJourDeLaCharteGraphique() {
+ $this->assertXPathContentContains('//h1', 'Mise à jour de la charte graphique');
+ }
+
+
+ /** @test */
+ public function listShouldContainsSkinValence() {
+ $this->assertXPathContentContains('//ul/li/h2', 'Thème Valence');
+ }
+
+
+ /** @test */
+ public function valenceShouldhaveBeenUpdatedOn25Slash04slash2016() {
+ $this->assertXPathContentContains('//ul/li/dl/dd', '25/04/2016 15:01:37');
+ }
+
+
+ /** @test */
+ public function buttonUpdateSkinShouldBePresent() {
+ $this->assertContains('admin/index/update-skin/git/pull', $this->_response->getBody());
+ }
+}
+
+
+
+class IndexControllerUpdateSkinGitPullTest extends IndexControllerUpdateSkinTestCase {
+ public function setUp() {
+ parent::setUp();
+ $this->dispatch('admin/index/update-skin/git/pull', true);
+ }
+
+
+ /** @test */
+ public function askSendShouldBeDisplay() {
+ $this->assertFlashMessengerContentContains('La demande de mise à jour a été envoyée au serveur');
+ }
+}
\ No newline at end of file
diff --git a/tests/library/Class/Profil/SkinUpdateReaderTest.php b/tests/library/Class/Profil/SkinUpdateReaderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8318c3e28396b8b61fe0ae4a108d899521ccb02
--- /dev/null
+++ b/tests/library/Class/Profil/SkinUpdateReaderTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_SkinUpdateReaderTest extends Storm_Test_ModelTestCase {
+ protected $_reader;
+
+ public function setUp() {
+ parent::setUp();
+
+ $file_system = (new Storm_FileSystem_Volatile())
+ ->mkdir(Class_Profil_Skin::EXTRA_PATH . 'Valence');
+
+ Class_Profil_Skin::setFileSystem($file_system);
+
+ $file_writer = $this->mock();
+ Class_Profil_SkinUpdateReader::setFileWriter($file_writer);
+
+ $time_source = new TimeSourceForTest('2016-05-02 12:30:00');
+ Class_Profil_SkinUpdateReader::setTimeSource($time_source);
+
+ $command = $this->mock();
+ Class_Profil_SkinUpdateReader::setCommand($command);
+
+ $command
+ ->whenCalled('exec')
+ ->with('cd ' . Class_Profil_SkinUpdateReader::getSkinsPath('Valence') . ' 2>&1 && git pull --rebase 2>&1 && cd ' . ROOT_PATH . ' 2>&1')
+ ->answers('')
+
+ ->whenCalled('getOutput')
+ ->answers([])
+
+ ->whenCalled('getReturnVar')
+ ->answers(0)
+
+ ->beStrict();
+
+ $file_writer
+ ->whenCalled('getContents')
+ ->with(Class_Profil_SkinUpdateReader::getLogPath())
+ ->answers(json_encode(['Valence' => ['Status' => '2016-05-02 12:30:00'],
+ 'should_run' => true]))
+
+ ->whenCalled('putContents')
+ ->with(Class_Profil_SkinUpdateReader::getLogPath(),
+ '{"Valence":{"Status":"2016-05-02 12:30:00<br>"},"should_run":false}')
+ ->answers(true)
+
+ ->beStrict();
+
+ $this->_reader = new Class_Profil_SkinUpdateReader();
+ $this->_reader->runGitPull();
+ }
+
+
+ /** @test */
+ public function valenceShouldHaveBeenUpdated() {
+ $this->assertEquals('2016-05-02 12:30:00', $this->_reader->getStatus('Valence'));
+ }
+}
diff --git a/tests/library/Class/Profil/UpdateSkinTest.php b/tests/library/Class/Profil/UpdateSkinTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391