Skip to content
Snippets Groups Projects
Commit 3de63f56 authored by Laurent's avatar Laurent
Browse files

status report: do not send data for digital connectors with no album and disabled

parent d598f779
Branches
Tags
2 merge requests!2080Sandbox detach zf from storm,!2061Master
Pipeline #277 passed with stage
in 8 minutes and 24 seconds
......@@ -205,7 +205,7 @@ class Class_Systeme_Report_DigitalConnectors extends Class_Systeme_Report_Abstra
if ($description['doctype_id'] && in_array('HARVEST', $description['features']))
$record['album_count'] = Class_Album::countBy(['type_doc_id' => $description['doctype_id']]);
if ($description['enabled'] || isset($record['album_count']))
if ($description['enabled'] || (isset($record['album_count']) && $record['album_count']))
$visitor->visitRecordValues($record);
}
}
......
......@@ -284,27 +284,17 @@ class ZendAfi_View_Helper_Status_JsonTest extends ZendAfi_View_Helper_Status_Tes
/** @test */
public function OrpheaShouldEnabled() {
$this->assertContains(["code" => "ORPHEA",
"label" => "Orphea",
"enabled" => true,
"features" => ["HARVEST", "SSO"],
"album_count" => 0
],
$this->_report['digital_connectors']);
public function OrpheaShouldNotBePresent() {
$this->assertNotContains(["code" => "ORPHEA",
"label" => "Orphea",
"enabled" => false,
"features" => ["HARVEST", "SSO"],
"album_count" => 0
],
$this->_report['digital_connectors']);
}
/** @test */
public function MyCowShouldEnabled() {
$this->assertContains(["code" => "MYCOW",
"label" => "MyCoW",
"enabled" => true,
"features" => ["SSO"],
],
$this->_report['digital_connectors']);
}
/** @test */
public function PlanetNemoShouldEnabled() {
$this->assertContains(["code" => "PLANETNEMO",
......@@ -373,7 +363,7 @@ class ZendAfi_View_Helper_Status_JsonTest extends ZendAfi_View_Helper_Status_Tes
/** @test */
public function CiteDeLaMusiqueShouldEnabled() {
public function CiteDeLaMusiqueShouldBeEnabled() {
$this->assertContains(["code" => "CITEDELAMUSIQUE",
"label" => "Cité de la musique",
"enabled" => true,
......@@ -386,12 +376,12 @@ class ZendAfi_View_Helper_Status_JsonTest extends ZendAfi_View_Helper_Status_Tes
/** @test */
public function SoundCloudShouldDisabled() {
public function SoundCloudShouldDisabledButPresent() {
$this->assertContains(["code" => "SoundCloud",
"label" => "SoundCloud",
"enabled" => false,
"features" => ["HARVEST"],
"album_count" => 0
"album_count" => 1
],
$this->_report['digital_connectors']);
}
......
......@@ -105,6 +105,10 @@ abstract class ZendAfi_View_Helper_Status_TestCase extends ViewHelperTestCase {
protected function _setupDigitalResources() {
RessourcesNumeriquesFixtures::activate();
RessourcesNumeriquesFixtures::deactivateOrphea();
$this->fixture('Class_Album',
['id' => 1,
'type_doc_id' => Class_TypeDoc::SOUNDCLOUD]);
return $this;
}
......
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