diff --git a/application/modules/admin/controllers/AlbumController.php b/application/modules/admin/controllers/AlbumController.php index b23d8a64c61bf038cf64fa34b9d81f80e6c78bee..713d3f2beb887492f8b4f13e0277766cd483635b 100644 --- a/application/modules/admin/controllers/AlbumController.php +++ b/application/modules/admin/controllers/AlbumController.php @@ -70,7 +70,7 @@ class Admin_AlbumController extends ZendAfi_Controller_Action { } - public function importDilicomAction() { + public function dilicomAction() { $this->view->titre = $this->_('PNB Dilicom'); $form = $this->_formImportDilicom(); $this->view->form_import_dilicom = $form; @@ -122,7 +122,7 @@ class Admin_AlbumController extends ZendAfi_Controller_Action { ->newForm(['id' => 'import_dilicom', 'class' => 'form']) ->setMethod('post') ->setAttrib('enctype', 'multipart/form-data') - ->setAction($this->view->url(['action' => 'import-dilicom'])) + ->setAction($this->view->url(['action' => 'dilicom'])) ->addElement($this->view->newFormElementFile('offers', 'xml'), 'offers') ->addElement('submit', 'submit', ['label' => $this->_('Importer le fichier XML')]); } diff --git a/application/modules/admin/views/scripts/album/import-dilicom.phtml b/application/modules/admin/views/scripts/album/dilicom.phtml similarity index 99% rename from application/modules/admin/views/scripts/album/import-dilicom.phtml rename to application/modules/admin/views/scripts/album/dilicom.phtml index 037e66cd6366223e18204ebb8b010c5e80101728..c30ea353cd433dbce58495dc330e0ee208f0bcc2 100644 --- a/application/modules/admin/views/scripts/album/import-dilicom.phtml +++ b/application/modules/admin/views/scripts/album/dilicom.phtml @@ -1,5 +1,4 @@ <?php - $title = function($model, $attrib) { return $this->tagAnchor($this->url(['module' => 'admin', 'controller' => 'album', diff --git a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php index 975a38b9dad66d96a146f12d4d3347529cf2a89b..c3280182c57b0494296b61d34ea3e2c1bf2e455b 100644 --- a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php +++ b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php @@ -159,7 +159,7 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdmin extends ZendAfi_View_Helper_Base Class_AdminVar::isBibNumEnabled() && $this->filterAdmin($this->user)) - .$this->addMenu("pnb_16.png", $this->translate()->_("PNB Dilicom"), "/admin/album/import-dilicom", + .$this->addMenu("pnb_16.png", $this->translate()->_("PNB Dilicom"), "/admin/album/dilicom", Class_AdminVar::isDilicomPNBEnabled() && $this->filterAdmin($this->user)) diff --git a/tests/application/modules/admin/controllers/AlbumControllerDilicomPNBTest.php b/tests/application/modules/admin/controllers/AlbumControllerDilicomPNBTest.php index 10f9059be20c8c49efb2e44bb2abd6067318bb36..51d25a437ff3fb69009ff17f130080f4c8984573 100644 --- a/tests/application/modules/admin/controllers/AlbumControllerDilicomPNBTest.php +++ b/tests/application/modules/admin/controllers/AlbumControllerDilicomPNBTest.php @@ -56,9 +56,11 @@ abstract class Admin_AlbumControllerDilicomPNBTestCase extends Admin_AbstractCon class AlbumControllerDilicomPNBImportDilicomTest extends Admin_AlbumControllerDilicomPNBTestCase { + protected $_storm_default_to_volatile = true; + public function setUp() { parent::setUp(); - $this->dispatch('/admin/album/import-dilicom', true); + $this->dispatch('/admin/album/dilicom', true); } @@ -75,8 +77,8 @@ class AlbumControllerDilicomPNBImportDilicomTest extends Admin_AlbumControllerDi /** @test */ - public function nbOfLiveLoansShouldBe5() { - $this->assertXPathContentContains('//table//tr/td', '2 / 5', $this->_response->getBody()); + public function nbOfLiveLoansShouldBe2() { + $this->assertXPathContentContains('//table//tr/td', '2 / 15'); } @@ -168,7 +170,7 @@ class AlbumControllerDilicomPNBImportDilicomPaginatorTest extends Admin_AlbumCon public function setUp() { parent::setUp(); $this->generateDilicomAlbums(); - $this->dispatch('admin/album/import-dilicom', true); + $this->dispatch('admin/album/dilicom', true); } diff --git a/tests/application/modules/admin/controllers/AlbumControllerTest.php b/tests/application/modules/admin/controllers/AlbumControllerTest.php index 0643ba8b4af279dbf1e1de92565bb9b37886f52e..607ef737d4b2c370d79648cc1639243986dbf112 100644 --- a/tests/application/modules/admin/controllers/AlbumControllerTest.php +++ b/tests/application/modules/admin/controllers/AlbumControllerTest.php @@ -2633,7 +2633,7 @@ class Admin_AlbumControllerImportEADTest extends Admin_AlbumControllerTestCase { class Admin_AlbumControllerImportDilicomTest extends Admin_AlbumControllerTestCase { public function setUp() { parent::setUp(); - $this->dispatch('/admin/album/import-dilicom', true); + $this->dispatch('/admin/album/dilicom', true); } @@ -2657,7 +2657,7 @@ class Admin_AlbumControllerImportDilicomTest extends Admin_AlbumControllerTestCa /** @test */ public function formImportOffersShouldContainsFileInputForXML() { - $this->assertXPath('//form[contains(@action, "admin/album/import-dilicom")]//input[@type="file"][@name="offers"]'); + $this->assertXPath('//form[contains(@action, "admin/album/dilicom")]//input[@type="file"][@name="offers"]'); } diff --git a/tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php b/tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php index 5a5a2eb0b17b9abbdfaddef7a3973254be3288d5..d7a7234ad4843ce87872030fe47a732ff729e700 100644 --- a/tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php +++ b/tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php @@ -85,7 +85,7 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdminVariableAsAdminTest extends ZendA /** @test */ public function menuImportDilicomShouldNotBeVisibleWhenOptionDILICOM_PNB_isDisabled() { $this->assertNotXPath($this->helper->menuGaucheAdmin(), - '//a[contains(@href, "/admin/album/import-dilicom")]'); + '//a[contains(@href, "/admin/album/dilicom")]'); } @@ -93,7 +93,7 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdminVariableAsAdminTest extends ZendA public function menuImportDilicomShouldBeVisibleWhenOptionDILICOM_PNB_isEnabled() { RessourcesNumeriquesFixtures::activateDilicom(); $this->assertXPath($this->helper->menuGaucheAdmin(), - '//a[contains(@href, "/admin/album/import-dilicom")]'); + '//a[contains(@href, "/admin/album/dilicom")]'); } diff --git a/tests/library/ZendAfi/View/Helper/RenderAlbumTest.php b/tests/library/ZendAfi/View/Helper/RenderAlbumTest.php index 204e1fe3bac567effbe1b6adce8779e21fd0dbf7..d3321c76297492f5e5a419d194d65075a920da21 100644 --- a/tests/library/ZendAfi/View/Helper/RenderAlbumTest.php +++ b/tests/library/ZendAfi/View/Helper/RenderAlbumTest.php @@ -385,18 +385,4 @@ class ZendAfi_View_Helper_RenderAlbumDilicomPNBTest extends ZendAfi_View_Helper_ public function albumShouldHaveBeenUpdateThroughHubGetLoanStatus() { $this->assertContains('getLoanStatus', $this->_http->getFirstAttributeForLastCallOn('open_url')); } - - - /** @test */ - public function currentLoansCountShouldBe45OutOf50() { - $this->assertXPathContentContains($this->_html, '//p', 'Nombre d\'emprunts en cours: 45 / 50'); - } - - - /** @test */ - public function withMaxLoanLimitOf47CurrentLoansCountShouldBe45OutOf47() { - Class_AdminVar::set('DILICOM_PNB_LOAN_COUNT_LIMIT', 47); - $this->_html = $this->_helper->renderAlbum($this->book); - $this->assertXPathContentContains($this->_html, '//p', 'Nombre d\'emprunts en cours: 45 / 47'); - } }