test fixes

core/API/Proxy.php

@@ -373,8 +373,8 @@ class Proxy extends Singleton
         $hideLine = strstr($docComment, '@hide');
         if($hideLine) {
             $hideString = trim(str_replace("@hide", "", strtok($hideLine, "\n")));
+            $response = false;
             if($hideString) {
-                $response = false;
                 $hideArray = explode(" ", $hideString);
                 $hideString = $hideArray[0];
                 /**
@@ -400,8 +400,8 @@ class Proxy extends Singleton
                  * if the plugin API should be hidden from the current user.
                  */
                 Piwik::postEvent(sprintf('API.DocumentationGenerator.hide%s', $hideString), array(&$response));
-                return $response;
             }
+            return $response;
         }
         return false;
     }
@@ -478,7 +478,7 @@ class Proxy extends Singleton
             && $method->getName() != 'getInstance'
             && false === strstr($method->getDocComment(), '@deprecated')
             && (!$this->hideIgnoredFunctions || false === strstr($method->getDocComment(), '@ignore'))
-            && (Piwik::hasUserSuperUserAccess() || false === $this->checkIfMethodContainsHideAnnotation($method))
+            && (false === $this->checkIfMethodContainsHideAnnotation($method))
         ) {
             $name = $method->getName();
             $parameters = $method->getParameters();

tests/PHPUnit/Core/API/DocumentationGeneratorTest.php

@@ -10,6 +10,8 @@
 use Piwik\API\DocumentationGenerator;
 use Piwik\API\Proxy;
 use Piwik\EventDispatcher;
+use Piwik\Plugin\Manager as PluginManager;
+
 /**
  * @group Core
  */
@@ -50,6 +52,9 @@ class DocumentationGeneratorTest extends PHPUnit_Framework_TestCase
     public function testPrepareModuleToDisplay()
     {
         $moduleName = 'VisitTime';
+        if(!PluginManager::getInstance()->isPluginActivated($moduleName)) {
+            PluginManager::getInstance()->activatePlugin($moduleName);
+        }
         $moduleToDisplay = "<a href='#VisitTime'>VisitTime</a><br/>";
         $documentationGenerator = new DocumentationGenerator();
         $this->assertEquals($documentationGenerator->prepareModuleToDisplay($moduleName), $moduleToDisplay);
@@ -91,6 +96,9 @@ class DocumentationGeneratorTest extends PHPUnit_Framework_TestCase
                 'VisitTime API lets you access reports by Hour (Server time), and by Hour Local Time of your visitors.',
         );
         $moduleName = 'VisitTime';
+        if(!PluginManager::getInstance()->isPluginActivated($moduleName)) {
+            PluginManager::getInstance()->activatePlugin($moduleName);
+        }
         $documentationGenerator = New DocumentationGenerator();
         $actualModulesAndMethods = $documentationGenerator->prepareModulesAndMethods($info, $moduleName);
         return array(
@@ -114,6 +122,9 @@ class DocumentationGeneratorTest extends PHPUnit_Framework_TestCase
             '__documentation' => 'API for plugin Feedback',
         );
         $moduleName = 'Feedback';
+        if(!PluginManager::getInstance()->isPluginActivated($moduleName)) {
+            PluginManager::getInstance()->activatePlugin($moduleName);
+        }
         $methods = array(
             'sendFeedbackForFeature'
         );
@@ -148,6 +159,9 @@ class DocumentationGeneratorTest extends PHPUnit_Framework_TestCase
     }
     public function providerAddExamples()
     {
+        if(!PluginManager::getInstance()->isPluginActivated('VisitTime')) {
+            PluginManager::getInstance()->activatePlugin('VisitTime');
+        }
         $class = '\Piwik\Plugins\VisitTime\API';
         $methodName = 'getVisitInformationPerLocalTime';
         $prefixUrls = '';
@@ -170,6 +184,9 @@ class DocumentationGeneratorTest extends PHPUnit_Framework_TestCase
     }
     public function testGetExampleUrl()
     {
+        if(!PluginManager::getInstance()->isPluginActivated('VisitTime')) {
+            PluginManager::getInstance()->activatePlugin('VisitTime');
+        }
         $class = '\Piwik\Plugins\VisitTime\API';
         $methodName = 'getVisitInformationPerLocalTime';
         $parametersToSet = array(
@@ -186,6 +203,9 @@ class DocumentationGeneratorTest extends PHPUnit_Framework_TestCase
     }
     public function testGetParametersString()
     {
+        if(!PluginManager::getInstance()->isPluginActivated('VisitTime')) {
+            PluginManager::getInstance()->activatePlugin('VisitTime');
+        }
         $class = '\Piwik\Plugins\VisitTime\API';
         $name = 'getVisitInformationPerLocalTime';
         $parameters = "(idSite, period, date, segment = '')";