Fix System tests

2 files changed, 12 insertions, 10 deletions

diff --git a/plugins/API/API.php b/plugins/API/API.php
index d320306a61..809c94fa13 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -564,8 +564,7 @@ class API extends \Piwik\Plugin\API
     public function getGlossaryReports($idSite)
     {
         $glossary = StaticContainer::get('Piwik\Plugins\API\Glossary');
-        $glossary->setIdSite($idSite);
-        return $glossary->reportsGlossary();
+        return $glossary->reportsGlossary($idSite);
     }
 
     /**
@@ -577,8 +576,7 @@ class API extends \Piwik\Plugin\API
     public function getGlossaryMetrics($idSite)
     {
         $glossary = StaticContainer::get('Piwik\Plugins\API\Glossary');
-        $glossary->setIdSite($idSite);
-        return $glossary->metricsGlossary();
+        return $glossary->metricsGlossary($idSite);
     }
 
     /**
diff --git a/plugins/API/Glossary.php b/plugins/API/Glossary.php
index df42a3d145..c6e15a25b1 100644
--- a/plugins/API/Glossary.php
+++ b/plugins/API/Glossary.php
@@ -13,15 +13,17 @@ class Glossary
 {
     protected $metadata = array();
 
-    public function setIdSite($idSite)
+    public function __construct(API $api)
     {
-        $this->metadata = API::getInstance()->getReportMetadata($idSite);
+        $this->api = $api;
     }
 
-    public function reportsGlossary()
+    public function reportsGlossary($idSite)
     {
+        $metadata = $this->api->getReportMetadata($idSite);
+
         $reports = array();
-        foreach ($this->metadata as $report) {
+        foreach ($metadata as $report) {
             if (isset($report['documentation'])) {
                 $reports[] = array(
                     'name' => sprintf("%s (%s)", $report['name'], $report['category']),
@@ -37,10 +39,12 @@ class Glossary
         return $reports;
     }
 
-    public function metricsGlossary()
+    public function metricsGlossary($idSite)
     {
+        $metadata = $this->api->getReportMetadata($idSite);
+
         $metrics = array();
-        foreach ($this->metadata as $report) {
+        foreach ($metadata as $report) {
             if (!isset($report['metricsDocumentation'])) {
                 continue;
             }