Add update command test with up-to-date directory

Author: kylekatarnls

src/Phug/Split/Command/Update.php

@@ -108,7 +108,7 @@ protected function distributePackage(Split $cli, array $package, string $branch)
             : [];
 
         $cli->chdir($sourceDirectory);
-        $this->git('stash');
+        $this->git('stash', [], '2>&1');
 
         try {
             $log = $hash ? $this->getReplayLog($cli, $hash) : $this->latest(1, '.');
@@ -155,7 +155,7 @@ protected function distributePackage(Split $cli, array $package, string $branch)
         $cli->chdir($sourceDirectory);
 
         $this->git("checkout -f $branch", [], '2>&1');
-        $this->git('stash pop');
+        $this->git('stash pop', [], '2>&1');
 
         return true;
     }

tests/Phug/Command/UpdateTest.php

@@ -133,6 +133,103 @@ public function testSetGitCommitter()
             $output
         );
     }
+    /**
+     * @covers ::distributePackage
+     */
+    public function testRun()
+    {
+        $cwd = getcwd();
+        $cli = new Split();
+        $cli->setEscapeCharacter('#');
+        $dist = new Update();
+
+        $directory1 = sys_get_temp_dir().'/split-test-'.mt_rand(0, 9999999);
+        FileSystem::createDir($directory1);
+        FileSystem::createDir("$directory1/sub-package");
+        FileSystem::createDir("$directory1/api/vendor");
+        $directory1 = realpath($directory1);
+        $subPackageDirectory = realpath("$directory1/sub-package");
+
+        $directory2 = sys_get_temp_dir().'/split-test-'.mt_rand(0, 9999999);
+        FileSystem::createDir("$directory2/tests");
+        $directory2 = realpath($directory2);
+
+        chdir($directory1);
+        file_put_contents('composer.json', json_encode(['name' => 'vendor/package']));
+        file_put_contents('sub-package/composer.json', json_encode(['name' => 'vendor/sub-package']));
+        file_put_contents('a.txt', 'A');
+        file_put_contents('b.txt', 'B');
+        file_put_contents('c.txt', 'C');
+        shell_exec('git init 2>&1');
+        shell_exec('git add --all 2>&1');
+        shell_exec('git commit --message=Init 2>&1');
+        preg_match('/^commit (\S+)/', shell_exec('git log -n 1'), $match);
+        $hash1 = $match[1];
+
+        file_put_contents('api/vendor/sub-package.json', json_encode([
+            'packages' => [
+                'vendor/sub-package' => [
+                    'dev-master' => [
+                        'source' => [
+                            'type' => 'git',
+                            'url' => $directory2,
+                        ],
+                    ],
+                ],
+            ],
+        ]));
+
+        chdir($directory2);
+        file_put_contents('composer.json', json_encode(['name' => 'vendor/sub-package']));
+        file_put_contents('d.txt', 'D');
+        file_put_contents('e.txt', 'E');
+        file_put_contents('f.txt', 'F');
+        shell_exec('git init 2>&1');
+        shell_exec('git add --all 2>&1');
+        file_put_contents('message.txt', "ABC\n\nsplit: $hash1");
+        shell_exec('git commit --file=message.txt 2>&1');
+
+        chdir($directory1);
+
+        ob_start();
+        $dist->api = 'api/%s.json';
+        $return = $dist->run($cli);
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        $outputDirectory = realpath("$directory1/dist");
+        $contentD = @file_get_contents("$outputDirectory/vendor/sub-package/d.txt");
+        $contentE = @file_get_contents("$outputDirectory/vendor/sub-package/e.txt");
+        $contentF = @file_get_contents("$outputDirectory/vendor/sub-package/f.txt");
+
+        chdir($cwd);
+
+        foreach ([$directory1, $directory2] as $directory) {
+            @shell_exec('rm -rf ' . escapeshellarg($directory) . ' 2>&1');
+            file_exists($directory) && @shell_exec('rmdir /S /Q ' . escapeshellarg($directory) . ' 2>&1');
+            @FileSystem::delete($directory);
+        }
+
+        $path = $directory1.DIRECTORY_SEPARATOR;
+        $expected = implode("\n", array_merge([
+            'vendor/package',
+            '#[1;35mBuild vendor/sub-package',
+            "#[0m#[1;32mgit clone $directory2 {$path}dist/vendor/sub-package",
+            "#[0m#[1;30mCloning into '{$path}dist/vendor/sub-package'...",
+            'done.',
+            "#[0m#[1;34mcd {$path}dist/vendor/sub-package",
+            '#[0m#[1;32mgit checkout master',
+            "#[0m#[1;34mcd $subPackageDirectory",
+            '#[0m#[0;32mvendor/sub-package is already up to date.',
+            "#[0m#[1;35mBuild distributed in {$path}dist",
+            '#[0m',
+        ]));
+        $this->assertSame($expected, $output);
+        $this->assertTrue($return);
+        $this->assertSame('D', $contentD);
+        $this->assertSame('E', $contentE);
+        $this->assertSame('F', $contentF);
+    }
 
     /**
      * @covers ::distributePackage