Add options: coverage, group and ignore-tests

Author: kylekatarnls

composer.json

@@ -28,7 +28,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.5.0",
-        "phpunit/phpunit": ">=4.0",
+        "phpunit/phpunit": ">=4.0 <6",
         "phpunit/php-code-coverage": ">=2.2",
         "squizlabs/php_codesniffer": "2.*",
         "symfony/console": "^3.2",

src/Phug/DevTool/Command/CheckCommand.php

@@ -13,6 +13,11 @@ protected function configure()
     {
         $this->setName('check')
             ->addOption('report', null, InputOption::VALUE_NONE)
+            ->addOption('coverage-text', null, InputOption::VALUE_NONE, 'Display coverage info?')
+            ->addOption('coverage-html', null, InputOption::VALUE_OPTIONAL, 'Save coverage info as HTML?', false)
+            ->addOption('coverage-clover', null, InputOption::VALUE_OPTIONAL, 'Save coverage info as XML?', false)
+            ->addOption('group', null, InputOption::VALUE_OPTIONAL, 'Excute only a tests group?', false)
+            ->addOption('ignore-tests', null, InputOption::VALUE_NONE)
             ->setDescription('Runs all necessary checks.')
             ->setHelp('Runs all necessary checks');
     }
@@ -22,10 +27,28 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $app = $this->getApplication();
         $coverageFilePath = $app->getWorkingDirectory().'/coverage.xml';
 
-        if (($code = $app->runCommand('unit-tests:run', $output, [
+        $args = [
             '--coverage-text' => true,
             '--coverage-clover' => $coverageFilePath,
-        ])) !== 0) {
+        ];
+
+        if ($input->getOption('coverage-text')) {
+            $args[] = '--coverage-text';
+        }
+
+        if ($path = $input->getOption('coverage-clover')) {
+            $args['--coverage-clover'] = $path;
+        }
+
+        if ($path = $input->getOption('coverage-html')) {
+            $args['--coverage-html'] = $path;
+        }
+
+        if ($group = $input->getOption('group')) {
+            $args['--group'] = $group;
+        }
+
+        if (($code = $app->runCommand('unit-tests:run', $output, $args)) !== 0) {
             return $code;
         }
 
@@ -48,6 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (version_compare(PHP_VERSION, '5.6.0') >= 0 && ($code = $app->runCommand('code-style:check', $output, [
                 '--no-interaction',
+                '--ignore-tests' => $input->getOption('ignore-tests'),
             ])) !== 0) {
             return $code;
         }

src/Phug/DevTool/Command/CodeStyleCheckCommand.php

@@ -4,6 +4,7 @@
 
 use Phug\DevTool\AbstractCommand;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
@@ -12,6 +13,7 @@ class CodeStyleCheckCommand extends AbstractCommand
     protected function configure()
     {
         $this->setName('code-style:check')
+            ->addOption('ignore-tests', null, InputOption::VALUE_NONE)
             ->setDescription('Runs code style checker (phpcs).')
             ->setHelp('This command runs the code style checker');
     }
@@ -22,6 +24,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $args = [
             '--standard' => $this->getApplication()->getConfigFilePath('phpcs.xml'),
         ];
+        if ($input->getOption('ignore-tests')) {
+            $args[] = '--ignore=*/tests/*';
+        }
 
         if (($code = $this->getApplication()->runCodeStyleChecker($args)) === 0) {
             $output->writeln('<fg=green>Code looks great. Go on!</>');

src/Phug/DevTool/Command/UnitTestsRunCommand.php

@@ -13,7 +13,9 @@ protected function configure()
     {
         $this->setName('unit-tests:run')
             ->addOption('coverage-text', null, InputOption::VALUE_NONE, 'Display coverage info?')
-            ->addOption('coverage-clover', null, InputOption::VALUE_OPTIONAL, 'Save coverage info?', false)
+            ->addOption('coverage-html', null, InputOption::VALUE_OPTIONAL, 'Save coverage info as HTML?', false)
+            ->addOption('coverage-clover', null, InputOption::VALUE_OPTIONAL, 'Save coverage info as XML?', false)
+            ->addOption('group', null, InputOption::VALUE_OPTIONAL, 'Excute only a tests group?', false)
             ->setDescription('Runs unit tests (phpunit).')
             ->setHelp('This command runs the unit tests');
     }
@@ -33,6 +35,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $args['--coverage-clover'] = $path;
         }
 
+        if ($path = $input->getOption('coverage-html')) {
+            $args['--coverage-html'] = $path;
+        }
+
+        if ($group = $input->getOption('group')) {
+            $args['--group'] = $group;
+        }
+
         return $this->getApplication()->runUnitTests($args);
     }
 }

tests/Phug/DevTool/Command/UnitTestsRunCommandTest.php

@@ -2,7 +2,10 @@
 
 namespace Phug\Test\DevTool;
 
+use Phug\DevTool\Application;
 use Phug\DevTool\Command\UnitTestsRunCommand;
+use Symfony\Component\Console\Input\StringInput;
+use Symfony\Component\Console\Output\BufferedOutput;
 
 /**
  * Class UnitTestsRunCommandTest.
@@ -11,6 +14,18 @@
  */
 class UnitTestsRunCommandTest extends \PHPUnit_Framework_TestCase
 {
+    private static function remove($entity)
+    {
+        if (is_file($entity)) {
+            return unlink($entity);
+        }
+
+        foreach (scandir($entity) as $file) {
+            if ($file !== '.' && $file !== '..') {
+                self::remove($entity.'/'.$file);
+            }
+        }
+    }
     /**
      * @covers ::configure
      */
@@ -20,4 +35,45 @@ public function testConfigure()
 
         self::assertSame('unit-tests:run', $unitTests->getName());
     }
+
+    /**
+     * @group i
+     * @covers ::execute
+     */
+    public function testExecute()
+    {
+        $cwd = getcwd();
+        $app = realpath(__DIR__.'/../../../app');
+        chdir($app);
+        foreach (glob(__DIR__.'/../../../app/vendor/bin/*') as $file) {
+            chmod($file, 0777);
+        }
+        $coverageHtml = $app.DIRECTORY_SEPARATOR.'coverage';
+        $coverageClover = $app.DIRECTORY_SEPARATOR.'coverage.xml';
+        if (file_exists($coverageClover)) {
+            unlink($coverageClover);
+        }
+        $input = new StringInput(
+            'unit-tests:run'.
+            ' --coverage-text'.
+            ' --coverage-html='.escapeshellarg(addslashes($coverageHtml)).
+            ' --coverage-clover='.escapeshellarg(addslashes($coverageClover))
+        );
+        $buffer = new BufferedOutput();
+        $app = new Application();
+        $app->setAutoExit(false);
+        $code = $app->run($input, $buffer);
+        exit($buffer->fetch());
+        self::assertTrue(file_exists($coverageHtml));
+        self::assertTrue(file_exists($coverageClover));
+        if (file_exists($coverageHtml)) {
+            self::remove($coverageHtml);
+        }
+        if (file_exists($coverageClover)) {
+            unlink($coverageClover);
+        }
+        chdir($cwd);
+
+        self::assertRegExp('/test/', $buffer->fetch());
+    }
 }