Fix System tests

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);
     }
 
     /**

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;
             }

tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml

@@ -84,10 +84,6 @@
 		<name>Pages per Visit (Visitors)</name>
 		<documentation>In this report, you can see how many visits involved a certain number of pageviews. Initially, the report is shown as a tag cloud, more common numbers of pages are displayed in a larger font.&lt;br /&gt;Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation>
 	</row>
-	<row>
-		<name>Provider (Visitors)</name>
-		<documentation>This report shows which Internet Service Providers your visitors used to access the website. You can click on a provider name for more details. &lt;br /&gt; If Piwik can't determine a visitor's provider, it is listed as IP.</documentation>
-	</row>
 	<row>
 		<name>Referrer Type (Referrers)</name>
 		<documentation>This table contains information about the distribution of the referrer types.&lt;br /&gt;&lt;b&gt;Direct Entry:&lt;/b&gt; A visitor has entered the URL in his browser and started browsing on your website - he entered the website directly.&lt;br /&gt;&lt;b&gt;Search Engines:&lt;/b&gt; A visitor was referred to your website by a search engine. &lt;br /&gt; See the &quot;Search Engines &amp; Keywords&quot; report for more details.&lt;br /&gt;&lt;b&gt;Websites:&lt;/b&gt; The visitor followed a link on another website that led to your site. &lt;br /&gt; See the &quot;Websites &amp; Social&quot; report for more details.&lt;br /&gt;&lt;b&gt;Campaigns:&lt;/b&gt; Visitors that came to your website as the result of a campaign. &lt;br /&gt; See the &quot;Campaigns&quot; report for more details.</documentation>