Check message before status to get helpful failures

Author: kylekatarnls

tests/Phug/Command/AnalyzeTest.php

@@ -52,7 +52,6 @@ public function testRun()
         file_exists($directory) && @shell_exec('rmdir /S /Q '.escapeshellarg($directory).' 2>&1');
         @FileSystem::delete($directory);
 
-        $this->assertTrue($return);
         $this->assertSame(implode("\n", [
             'main/package',
             '#[1;36m ├ a/b',
@@ -61,6 +60,7 @@ public function testRun()
             '#[0m#[1;36m └ main/fuz',
             '#[0m',
         ]), $output);
+        $this->assertTrue($return);
     }
 
     /**
@@ -78,8 +78,8 @@ public function testErrors()
         $output = ob_get_contents();
         ob_end_clean();
 
-        $this->assertFalse($return);
         $this->assertSame("#[0;31mInput directory not found.\n#[0m", $output);
+        $this->assertFalse($return);
 
         $cwd = getcwd();
         chdir(__DIR__);
@@ -90,7 +90,7 @@ public function testErrors()
         ob_end_clean();
         chdir($cwd);
 
-        $this->assertFalse($return);
         $this->assertSame("#[0;31mRoot project directory should contains a composer.json file.\n#[0m", $output);
+        $this->assertFalse($return);
     }
 }

tests/Phug/Command/CopyTest.php

@@ -67,8 +67,8 @@ public function testRun()
             @FileSystem::delete($directory);
         }
 
-        $this->assertTrue($return);
         $this->assertSame("Copy ended.\n", $output);
+        $this->assertTrue($return);
         $this->assertSame('A', $contentA);
         $this->assertSame('B', $contentB);
         $this->assertFalse($contentC);
@@ -90,8 +90,8 @@ public function testErrors()
         $output = ob_get_contents();
         ob_end_clean();
 
-        $this->assertFalse($return);
         $this->assertSame("#[0;31mPlease provide an input repository URL.\n#[0m", $output);
+        $this->assertFalse($return);
 
         $cwd = getcwd();
         $copy = new Copy();
@@ -140,8 +140,8 @@ public function testErrors()
             @FileSystem::delete($directory);
         }
 
-        $this->assertFalse($return);
         $this->assertSame("#[0;31mLast commit must be linked to a mono-repository commit.\n#[0m", $output);
+        $this->assertFalse($return);
         $this->assertFalse($contentA);
         $this->assertFalse($contentB);
         $this->assertFalse($contentC);
@@ -193,8 +193,8 @@ public function testErrors()
             @FileSystem::delete($directory);
         }
 
-        $this->assertFalse($return);
         $this->assertSame("#[0;31mDestination directory \"i-do-not-exist\" does not seem to exist.\n#[0m", $output);
+        $this->assertFalse($return);
         $this->assertFalse($contentA);
         $this->assertFalse($contentB);
         $this->assertFalse($contentC);

tests/Phug/Command/DistTest.php

@@ -92,7 +92,6 @@ public function testRun()
             @FileSystem::delete($directory);
         }
 
-        $this->assertTrue($return);
         $path = $directory1.DIRECTORY_SEPARATOR;
         $expected = implode("\n", [
             'vendor/package',
@@ -104,6 +103,7 @@ public function testRun()
             '#[0m',
         ]);
         $this->assertSame($expected, $output);
+        $this->assertTrue($return);
         $this->assertSame('D', $contentD);
         $this->assertSame('E', $contentE);
         $this->assertSame('F', $contentF);
@@ -125,8 +125,8 @@ public function testErrors()
         $output = ob_get_contents();
         ob_end_clean();
 
-        $this->assertFalse($return);
         $this->assertSame("#[0;31mRoot project directory should contains a composer.json file.\n#[0m", $output);
+        $this->assertFalse($return);
 
         $cwd = getcwd();
         $dist = new Dist();
@@ -154,8 +154,8 @@ public function testErrors()
         file_exists($directory) && @shell_exec('rmdir /S /Q ' . escapeshellarg($directory) . ' 2>&1');
         @FileSystem::delete($directory);
 
-        $this->assertFalse($return);
         $this->assertSame("vendor/package\n#[0;31mUnable to create output directory.\n#[0m", $output);
+        $this->assertFalse($return);
 
         $dist = new Dist();
 
@@ -192,10 +192,10 @@ public function testErrors()
             @FileSystem::delete($directory);
         }
 
-        $this->assertFalse($return);
         $this->assertSame(
             "vendor/sub-package\n#[0;31mYou must be on a branch in a git repository to run this command.\n#[0m",
             $output
         );
+        $this->assertFalse($return);
     }
 }