Merge pull request #10 from malukenho/bugfix/#3-use-default-unit-line…

…-end Fix 2 new line when feature has no description
malukenho · Mar 31, 2016 · eb70f7b · eb70f7b
2 parents 1ce8598 + e07de2d
commit eb70f7b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/src/Command/FixGherkinCodeStyle.php b/src/Command/FixGherkinCodeStyle.php
@@ -88,9 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $directory = $input->getArgument('directory');
         $finder    = (new FeatureResolve($directory))->__invoke();
 
-        $output->writeln('');
-        $output->writeln('Finding files on <info>' . $directory . '</info>');
-        $output->writeln('');
+        $output->writeln("\nFinding files on <info>" . $directory . "</info>\n");
 
         $tagFormatter       = new Tags();
         $featureDescription = new FeatureDescription();
@@ -111,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $filePointer = $file->openFile('w');
             $filePointer->fwrite($formatted);
 
-            $output->writeln('<info>' . $file->getRealpath() . '</info>');
+            $output->writeln('<info>' . $file->getRealPath() . '</info>');
         }
     }
 }
diff --git a/src/Formatter/FeatureDescription.php b/src/Formatter/FeatureDescription.php
@@ -33,8 +33,13 @@ final class FeatureDescription extends AbstractFormatter
      */
     public function format(FeatureNode $feature)
     {
-        $shortDesc   = $feature->getKeyword() . ': ' . $feature->getTitle() . "\n";
-        $longDesc    =  implode(
+        $shortDesc = $feature->getKeyword() . ': ' . $feature->getTitle() . "\n";
+
+        if (! $feature->hasDescription()) {
+            return rtrim($shortDesc);
+        }
+
+        $longDesc = implode(
             array_map(
                 function ($descriptionLine) {
                     return $this->indent() . trim($descriptionLine) . "\n";

diff --git a/tests/Command/CheckGherkinCodeStyleTest.php b/tests/Command/CheckGherkinCodeStyleTest.php
@@ -80,6 +80,10 @@ public function testShouldReturnErrorIfThereIsFilesWithWrongStyle()
             ->method('hasTags')
             ->willReturn(true);
 
+        $feature->expects(self::once())
+            ->method('getKeyword')
+            ->willReturn('Feature');
+
         $feature->expects(self::once())
             ->method('getTags')
             ->willReturn(
@@ -92,6 +96,10 @@ public function testShouldReturnErrorIfThereIsFilesWithWrongStyle()
                 'User registration'
             );
 
+        $feature->expects(self::once())
+            ->method('hasDescription')
+            ->willReturn(true);
+
         $feature->expects(self::once())
             ->method('getDescription')
             ->willReturn(

diff --git a/tests/functional/check-file-can-format-table-using-unix-line-endings.phpt b/tests/functional/check-file-can-format-table-using-unix-line-endings.phpt
@@ -23,7 +23,6 @@ Wrong style: %A/tests/assets/issue-3.feature
 -        | de     | Herzlich Willkommen %USERNAME%.   |
 -        | ar     | مرحبا %USERNAME%                  |
 -        | ja     | ようこそ %USERNAME%                |
-+
 +    Scenario Outline:
 +        When I navigate in <locale> language
 +        Then I should see "<message>"