Déplacement du controller Amber côté admin

.gitattributes

@@ -283,6 +283,7 @@ amber/src/st/SUnit.st -text
 application/modules/admin/controllers/AccueilController.php -text
 application/modules/admin/controllers/AjaxController.php -text
 application/modules/admin/controllers/AlbumController.php -text
+application/modules/admin/controllers/AmberController.php -text
 application/modules/admin/controllers/AuthController.php -text
 application/modules/admin/controllers/BibController.php -text
 application/modules/admin/controllers/CatalogueController.php -text
@@ -544,7 +545,6 @@ application/modules/admin/views/scripts/zone/edit.phtml -text
 application/modules/admin/views/scripts/zone/index.phtml -text
 application/modules/admin/views/scripts/zone/placerbibs.phtml -text
 application/modules/opac/controllers/AbonneController.php -text
-application/modules/opac/controllers/AmberController.php -text
 application/modules/opac/controllers/AuthController.php -text
 application/modules/opac/controllers/BibController.php -text
 application/modules/opac/controllers/BibNumeriqueController.php -text
@@ -4214,6 +4214,7 @@ tests/application/modules/admin/controllers/AlbumControllerEPubTest.php -text
 tests/application/modules/admin/controllers/AlbumControllerPharoVideosTest.php -text
 tests/application/modules/admin/controllers/AlbumControllerTest.php -text
 tests/application/modules/admin/controllers/AlbumControllerVideoAndAudioTest.php -text
+tests/application/modules/admin/controllers/AmberControllerTest.php -text
 tests/application/modules/admin/controllers/BibControllerTest.php -text
 tests/application/modules/admin/controllers/CatalogueControllerTest.php -text
 tests/application/modules/admin/controllers/CmsControllerTest.php -text
@@ -4255,7 +4256,6 @@ tests/application/modules/opac/controllers/AbonneControllerNewslettersTest.php -
 tests/application/modules/opac/controllers/AbonneControllerPretsTest.php -text
 tests/application/modules/opac/controllers/AbonneControllerSuggestionAchatTest.php -text
 tests/application/modules/opac/controllers/AbonneVSmartTest.php -text
-tests/application/modules/opac/controllers/AmberControllerTest.php -text
 tests/application/modules/opac/controllers/AuthControllerTest.php -text
 tests/application/modules/opac/controllers/BibControllerIndexActionTest.php -text
 tests/application/modules/opac/controllers/BibControllerTest.php -text

application/modules/opac/controllers/AmberController.php → application/modules/admin/controllers/AmberController.php

@@ -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 
  */
-class AmberController extends Zend_Controller_Action {
+class Admin_AmberController extends Zend_Controller_Action {
 	use Trait_StaticFileWriter;
 
 	public function init() {

library/Class/ScriptLoader.php

@@ -409,8 +409,8 @@ class Class_ScriptLoader {
 	 */	
 	public function &getAmberReadyScripts() {
 		if (!isset($this->_amber_ready_scripts))
-			$this->_amber_ready_scripts = array(sprintf('smalltalk.Package._defaultCommitPathJs_("%s/opac/amber/commitJs")', BASE_URL),
-																					sprintf('smalltalk.Package._defaultCommitPathSt_("%s/opac/amber/commitSt")', BASE_URL),
+			$this->_amber_ready_scripts = array(sprintf('smalltalk.Package._defaultCommitPathJs_("%s/admin/amber/commitJs")', BASE_URL),
+																					sprintf('smalltalk.Package._defaultCommitPathSt_("%s/admin/amber/commitSt")', BASE_URL),
 																					sprintf('smalltalk.Ajax._opacBaseUrl_idProfil_("%s", "%d")', BASE_URL, Class_Profil::getCurrentProfil()->getId()));
 		return $this->_amber_ready_scripts;
 	}

tests/application/modules/opac/controllers/AmberControllerTest.php → tests/application/modules/admin/controllers/AmberControllerTest.php

@@ -18,11 +18,11 @@
  * 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 'AbstractControllerTestCase.php';
-require_once 'application/modules/opac/controllers/AmberController.php';
+require_once 'AdminAbstractControllerTestCase.php';
+require_once 'application/modules/admin/controllers/AmberController.php';
 
 
-class AmberControllerTest extends AbstractControllerTestCase {
+class AmberControllerTest extends Admin_AbstractControllerTestCase {
 	protected $_old_cfg, $cfg;
 
 	protected function _loginHook($account) {
@@ -32,10 +32,10 @@ class AmberControllerTest extends AbstractControllerTestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->assertInstanceOf('Class_FileWriter', AmberController::getFileWriter());
+		$this->assertInstanceOf('Class_FileWriter', Admin_AmberController::getFileWriter());
 
 		$this->mock_filewriter = $this->getMock('Class_FileWriter', array('putContents'));
-		AmberController::setFileWriter($this->mock_filewriter);
+		Admin_AmberController::setFileWriter($this->mock_filewriter);
 
 		$this->_old_cfg = Zend_Registry::get('cfg');
 		$this->cfg = new Zend_Config($this->_old_cfg->toArray(), true);
@@ -71,7 +71,7 @@ class AmberControllerTest extends AbstractControllerTestCase {
 			->method('putContents')
 			->with('./amber/src/js/Kernel.js', 'somejs');
 		
-		$this->putDispatch('amber/commitJs/Kernel.js', 'somejs');
+		$this->putDispatch('/admin/amber/commitJs/Kernel.js', 'somejs');
 	}
 
 
@@ -83,7 +83,7 @@ class AmberControllerTest extends AbstractControllerTestCase {
 			->method('putContents')
 			->with('./amber/afi/js/AFI-Core.js', 'somejs');
 		
-		$this->putDispatch('amber/commitJs/AFI-Core.js', 'somejs');
+		$this->putDispatch('/admin/amber/commitJs/AFI-Core.js', 'somejs');
 	}
 
 
@@ -96,7 +96,7 @@ class AmberControllerTest extends AbstractControllerTestCase {
 			->method('putContents')
 			->with('./amber/src/st/Kernel.st', 'some smalltalk');
 		
-		$this->putDispatch('amber/commitSt/Kernel.st', 'some smalltalk');
+		$this->putDispatch('/admin/amber/commitSt/Kernel.st', 'some smalltalk');
 	}
 
 
@@ -109,7 +109,7 @@ class AmberControllerTest extends AbstractControllerTestCase {
 			->expects($this->never())
 			->method('putContents');
 		
-		$this->putDispatch('amber/commitJs/Kernel.js', 'somejs');
+		$this->putDispatch('/admin/amber/commitJs/Kernel.js', 'somejs');
 	}
 }
 

tests/library/Class/ScriptLoaderTest.php

@@ -102,14 +102,14 @@ class ScriptLoaderAmberDevelopmentModeTest extends AbstractScriptLoaderTestCase
 
 	/** @test */
 	function commitPathJsShouldBeAmberCommitJs() {
-		$this->assertContains('"' . BASE_URL . '/opac/amber/commitJs"',
+		$this->assertContains('"' . BASE_URL . '/admin/amber/commitJs"',
 													Class_ScriptLoader::getInstance()->html());
 	}
 
 
 	/** @test */
 	function commitPathStShouldBeAmberCommitSt() {
-		$this->assertContains('"' . BASE_URL . '/opac/amber/commitSt"',
+		$this->assertContains('"' . BASE_URL . '/admin/amber/commitSt"',
 													Class_ScriptLoader::getInstance()->html());
 	}
 }