From b9b237e2c431c571dc678808727fa375cb036ee6 Mon Sep 17 00:00:00 2001 From: Patrick Barroca <pbarroca@afi-sa.fr> Date: Thu, 16 Feb 2017 15:19:58 +0100 Subject: [PATCH] dev #50215 fix "enabled" flag in digital resources list --- .../modules/admin/views/scripts/bibnum/index.phtml | 5 ++--- .../modules/admin/controllers/BibnumControllerTest.php | 10 ++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/application/modules/admin/views/scripts/bibnum/index.phtml b/application/modules/admin/views/scripts/bibnum/index.phtml index bddf56a1aa7..f03933bd172 100644 --- a/application/modules/admin/views/scripts/bibnum/index.phtml +++ b/application/modules/admin/views/scripts/bibnum/index.phtml @@ -7,7 +7,6 @@ echo $this->_("Si vous souhaitez ajouter une ressource à votre portail, il vous <?php $datas = (new Class_WebService_BibNumerique_Connectors())->getDescription(); $datas = json_decode(json_encode($datas)); - ?> <table class="digital_connectors"> <tbody> @@ -54,9 +53,9 @@ $datas = json_decode(json_encode($datas)); <?php } ?> <?php if ($contact) { ?> <br/><br/> - <?php echo $this->tag('strong', $this->_('Contact : ')) . implode(', ', $contact);?> + <?php echo $this->tag('strong', $this->_('Contact : ')) . implode(', ', $contact);}?> <br/><br/> - <?php if ($connector->enabled) + <?php if ($connector->enabled) { echo $this->tag('div', $this->_('Activé'), ['class' => 'enabled']);?> <?php } ?> </td> diff --git a/tests/application/modules/admin/controllers/BibnumControllerTest.php b/tests/application/modules/admin/controllers/BibnumControllerTest.php index 9b414b460d2..4b3df0cc9bf 100644 --- a/tests/application/modules/admin/controllers/BibnumControllerTest.php +++ b/tests/application/modules/admin/controllers/BibnumControllerTest.php @@ -24,6 +24,9 @@ class Admin_BibnumControllerIndexTest extends Admin_AbstractControllerTestCase { parent::setUp(); RessourcesNumeriquesFixtures::activate1Dtouch(); RessourcesNumeriquesFixtures::deactivateJamendo(); + $this->fixture('Class_AdminVar', + ['id' => 'Bibliondemand_SSO_URL', + 'valeur' => 'http://une-url.fr']); $this->dispatch('/admin/bibnum', true); } @@ -89,6 +92,13 @@ class Admin_BibnumControllerIndexTest extends Admin_AbstractControllerTestCase { public function bibliondemandShouldBeHarvestReady() { $this->assertXPathContentContains('//table[@class="digital_connectors"]//tr[@data-code="bibliondemand"]/td', 'Recherche fédérée'); } + + + /** @test */ + public function biliondemandShouldBeEnabled() { + $this->assertXPathContentContains('//table[@class="digital_connectors"]//tr[@data-code="bibliondemand"]/td//div[@class="enabled"]', + 'Activé'); + } } -- GitLab