Merge pull request zendframework#47 from Hounddog/feature/testing

Feature/testing

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "vendor/ScnSocialAuth"]
 	path = vendor/ScnSocialAuth
 	url = https://github.com/Hounddog/ScnSocialAuth.git
+[submodule "vendor/EdpGithub"]
+	path = vendor/EdpGithub
+	url = https://github.com/EvanDotPro/EdpGithub

.travis.yml

@@ -0,0 +1,12 @@
+language: php
+php:
+  - "5.3"
+
+before_script:
+- git submodule update --init --recursive
+
+script:
+  - phpunit
+
+notifications:
+  irc: "irc.freenode.org#zftalk.dev.modules"

Bootstrap.php

@@ -0,0 +1,51 @@
+<?php
+namespace EdpGithubTest;
+
+use Zend\Loader\AutoloaderFactory;
+use Zend\Mvc\Service\ServiceManagerConfig;
+use Zend\ServiceManager\ServiceManager;
+use Zend\Stdlib\ArrayUtils;
+use RuntimeException;
+
+error_reporting(E_ALL | E_STRICT);
+chdir(__DIR__);
+
+class Bootstrap
+{
+    protected static $serviceManager;
+
+    public static function init()
+    {
+        // Load the user-defined test configuration file, if it exists; otherwise, load
+        $config = include __DIR__ . '/config/application.config.php';
+
+        static::initAutoloader();
+
+        $serviceManager = new ServiceManager(new ServiceManagerConfig());
+        $serviceManager->setService('ApplicationConfig', $config);
+        $serviceManager->get('ModuleManager')->loadModules();
+        static::$serviceManager = $serviceManager;
+    }
+
+    public static function getServiceManager()
+    {
+        return static::$serviceManager;
+    }
+
+    protected static function initAutoloader()
+    {
+        $loader = include __DIR__ . '/init_autoloader.php';
+
+        AutoloaderFactory::factory(array(
+            'Zend\Loader\StandardAutoloader' => array(
+                'autoregister_zf' => true,
+                'namespaces' => array(
+                    'ApplicationTest' => __DIR__ . '/module/Application/test/ApplicationTest',
+                    'UserTest' => __DIR__ . '/module/User/test/UserTest',
+                ),
+            ),
+        ));
+    }
+}
+
+Bootstrap::init();

config/application.config.php

@@ -22,7 +22,6 @@
             'ScnSocialAuth' => '../moduledev/ScnSocialAuth',
             './module',
             './vendor',
-            '../moduledev',
         ),
     ),
 );

module/Application/src/Application/Service/Repository.php

@@ -26,7 +26,7 @@ public function getAllRepository($type)
         if(!isset($this->repository[$type])) {
             $client = $this->api;
 
-            $this->repositories[$type] = $client->api('current_user')->repos($type);
+            $this->repositories[$type] = $client->api('current_user')->repos();
         }
         return $this->repositories[$type];
     }

module/Application/src/Application/View/Helper/UserWidget.php

@@ -20,14 +20,13 @@ class UserWidget extends AbstractHelper
      */
     public function __invoke()
     {
-
         $vm = new ViewModel();
         $vm->setTemplate('user/user-widget.phtml');
-        
+
         return $this->getView()->render($vm);
     }
 
-    
+
     /**
      * @param string $viewTemplate
      * @return ZfcUserLoginWidget
@@ -37,5 +36,4 @@ public function setViewTemplate($viewTemplate)
         $this->viewTemplate = $viewTemplate;
         return $this;
     }
-
 }

module/Application/test/ApplicationTest/Service/RepositoryTest.php

@@ -7,31 +7,33 @@
 
 class RepositoryTest extends PHPUnit_Framework_TestCase
 {
-    public function setUp()
-    {
-        // your code here
-    }
-
-    public function tearDown()
-    {
-        // your code here
-    }
 
     public function testGetAllRepositories()
     {
-        $api = $this->getMock('EdpGithub\ApiClient\ApiClient');
-        $repo =  $this->getMock('EdpGithub\ApiClient\ApiFactory\Service\Repo');
+        $repo = $this->getMock(
+            'EdpGithub\Collection\RepositoryCollection',
+            array(),
+            array($this->getMock('EdpGithub\Http\Client'), 'somePath')
+        );
+
+        $currentUser = $this->getMock('EdpGithub\Api\CurrentUser');
+        $currentUser->expects($this->once())
+            ->method('repos')
+            ->will($this->returnValue($repo));
+
+        $api = $this->getMock('EdpGithub\Client');
 
         $api->expects($this->once())
-            ->method('getService')
-            ->with($this->equalTo('Repo'))
-            ->will($this->returnValue('test'));
+            ->method('api')
+            ->with($this->equalTo('current_user'))
+            ->will($this->returnValue($currentUser));
+
 
         $service = new Repository();
         $service->setApi($api);
 
-        $service->getAllRepository('member');
-
+        $result = $service->getAllRepository('member');
 
+        $this->assertInstanceOf('edpGithub\Collection\RepositoryCollection', $result);
     }
 }

module/Application/test/Bootstrap.php

@@ -1,5 +1,5 @@
 <?php
-namespace ApplicationTest;
+namespace EdpGithubTest;
 
 use Zend\Loader\AutoloaderFactory;
 use Zend\Mvc\Service\ServiceManagerConfig;
@@ -71,27 +71,25 @@ protected static function initAutoloader()
 
         if (is_readable($vendorPath . '/autoload.php')) {
             $loader = include $vendorPath . '/autoload.php';
-        }
+        } else {
+            $zf2Path = getenv('ZF2_PATH') ?: (defined('ZF2_PATH') ? ZF2_PATH : (is_dir($vendorPath . '/ZF2/library') ? $vendorPath . '/ZF2/library' : false));
 
-        $zf2Path = getenv('ZF2_PATH') ?: (defined('ZF2_PATH') ? ZF2_PATH : (is_dir($vendorPath . '/ZF2/library') ? $vendorPath . '/ZF2/library' : false));
+            if (!$zf2Path) {
+                throw new RuntimeException('Unable to load ZF2. Run `php composer.phar install` or define a ZF2_PATH environment variable.');
+            }
+
+            include $zf2Path . '/Zend/Loader/AutoloaderFactory.php';
 
-        if (!$zf2Path) {
-            throw new RuntimeException('Unable to load ZF2. Run `php composer.phar install` or define a ZF2_PATH environment variable.');
         }
 
-        if (isset($loader)) {
-            $loader->add('Zend', $zf2Path . '/Zend');
-        } else {
-            include $zf2Path . '/Zend/Loader/AutoloaderFactory.php';
-            AutoloaderFactory::factory(array(
-                'Zend\Loader\StandardAutoloader' => array(
-                    'autoregister_zf' => true,
-                    'namespaces' => array(
-                        __NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__,
-                    ),
+        AutoloaderFactory::factory(array(
+            'Zend\Loader\StandardAutoloader' => array(
+                'autoregister_zf' => true,
+                'namespaces' => array(
+                    __NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__,
                 ),
-            ));
-        }
+            ),
+        ));
     }
 
     protected static function findParentPath($path)
@@ -107,4 +105,4 @@ protected static function findParentPath($path)
     }
 }
 
-Bootstrap::init();
+Bootstrap::init();

module/Application/test/phpunit.xml

@@ -1,7 +1,29 @@
-<phpunit bootstrap="./Bootstrap.php" colors="true">
-    <testsuites>
-        <testsuite name="Application Module Tests">
-            <directory>./ApplicationTest</directory>
-        </testsuite>
-    </testsuites>
-</phpunit>
+<?xml version="1.0"?>
+<!-- works fine with PHPUnit-3.6.10 -->
+<phpunit
+        bootstrap="./Bootstrap.php"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        verbose="true"
+        stopOnFailure="false"
+        processIsolation="false"
+        backupGlobals="false"
+        syntaxCheck="true"
+        >
+    <testsuite name="EdpGithub Module Tests">
+        <directory>./ApplicationTest</directory>
+    </testsuite>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log
+            type="coverage-clover"
+            target="./clover.xml"
+        />
+    </logging>
+</phpunit>

module/User/Module.php

@@ -27,10 +27,12 @@ public function bootstrap(ModuleManager $moduleManager, ApplicationInterface $ap
         $em->attach('EdpGithub\Client', 'api', function($e) use ($sm) {
             $hybridAuth = $sm->get('HybridAuth');
             $adapter = $hybridAuth->getAdapter('github');
-            $token = $adapter->getAccessToken();
 
-            $client = $e->getTarget();
-            $client->authenticate('url_token', $token['access_token']);
+            if($adapter->isUserConnected()) {
+                $token = $adapter->getAccessToken();
+                $client = $e->getTarget();
+                $client->authenticate('url_token', $token['access_token']);
+            }
         } );
     }
 

module/User/view/zfc-user/user/index.phtml

@@ -157,14 +157,14 @@
                       <div class="span5 module-author">
                           <div class="row-fluid">
                               <div class="span2">
-                                  <?php $owner = $module->getOwner(); ?>
-                                  <img src="<?=$owner['avatar_url']?> " />
+                                  <?php $owner = $module->owner; ?>
+                                  <img src="<?=$owner->avatar_url?> " />
                               </div>
                               <div class="span10">
-                                  <strong><?=$owner['login']?></strong>
+                                  <strong><?=$owner->login?></strong>
                                   <p>
                                       <span class="author-label">Github:</span>
-                                      <a href="<?=$module->getUrl()?>"><?=$module->getName()?></a><br />
+                                      <a href="<?=$module->url?>"><?=$module->name?></a><br />
                                       <!--
                                       <span class="author-label">Blog:</span> <a>placeholder</a><br />
                                       <span class="author-label">Modules:</span> <a>5</a><br /><br />
@@ -174,13 +174,13 @@
                           </div>
                       </div>
                       <div class="span5">
-                          <strong><?=$module->getName()?></strong>
+                          <strong><?=$module->name?></strong>
                           <p>
                               <!--<span class="author-label">Version:</span> 1.2.1<br />-->
                               <span class="author-label">Created:</span>
                               <?php
-                              $date = new DateTime($module->getCreatedAt());
-                              echo $date->format('Y-m-d');
+                              //$date = new DateTime($module->getCreatedAt());
+                              //echo $date->format('Y-m-d');
                               ?><br />
                               <!--<span class="author-label">Edited:</span> <a>15 days ago</a><br />
                               <span class="author-label">Tags:</span>
@@ -193,7 +193,7 @@
                       <div class="span1">
                           <br />
                           <form action="<?=$this->url('module/add_module')?>" method="post">
-                              <input type="hidden" name="repository" value="<?=$module->getHtmlUrl()?>" />
+                              <input type="hidden" name="repository" value="<?=$module->html_url?>" />
                               <input type="submit" class="btn btn-success"/>
                           </form>
                       </div>
@@ -205,7 +205,7 @@
                       <div class="span12">
                           <strong>Description</strong>
                           <p>
-                              <?=$module->getDescription()?>
+                              <?=$module->description?>
                           </p>
                       </div>
                       <div style="clear: both;"></div>

phpunit.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!-- works fine with PHPUnit-3.6.10 -->
+<phpunit
+        bootstrap="./Bootstrap.php"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        verbose="true"
+        stopOnFailure="false"
+        processIsolation="false"
+        backupGlobals="false"
+        syntaxCheck="true"
+        >
+    <testsuite name="Test all modules">
+        <directory>./module/Application/test/ApplicationTest</directory>
+        <directory>./module/User/test/UserTest</directory>
+    </testsuite>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./module/Application/src</directory>
+            <directory suffix=".php">./module/User/src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log
+            type="coverage-clover"
+            target="./clover.xml"
+        />
+    </logging>
+</phpunit>