Adding escaping for spaces, umlaut test, refs #36, refs #34

dontdrinkandroot · Jun 17, 2016 · 12392fc · 12392fc
1 parent 28f2ac3
commit 12392fc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/Service/Git/GitService.php b/Service/Git/GitService.php
@@ -243,7 +243,7 @@ protected function add(array $paths)
     {
         $workingCopy = $this->getWorkingCopy();
         foreach ($paths as $path) {
-            $workingCopy->add($path->toRelativeFileSystemString());
+            $workingCopy->add($this->escapePath($path));
         }
     }
 
@@ -254,7 +254,7 @@ protected function remove(array $paths)
     {
         $workingCopy = $this->getWorkingCopy();
         foreach ($paths as $path) {
-            $workingCopy->rm($path->toRelativeFileSystemString());
+            $workingCopy->rm($this->escapePath($path));
         }
     }
 
@@ -268,4 +268,14 @@ protected function addAndCommitFile(GitUserInterface $author, $commitMessage, Fi
         $this->add([$path]);
         $this->commit($author, $commitMessage);
     }
+
+    /**
+     * @param $path
+     *
+     * @return mixed
+     */
+    protected function escapePath(Path $path)
+    {
+        return str_replace(" ", "\\ ", $path->toRelativeFileSystemString());
+    }
 }
diff --git a/Tests/Service/GitServiceTest.php b/Tests/Service/GitServiceTest.php
@@ -25,6 +25,7 @@ class GitServiceTest extends GitRepositoryTestCase
     public function setUp()
     {
         parent::setUp();
+
         $this->fileSystemService = new FileSystemService(GitRepositoryTestCase::GIT_REPOSITORY_PATH);
         $this->gitService = new GitService($this->fileSystemService);
     }
@@ -33,16 +34,33 @@ public function testAddAndCommit()
     {
         $user = new TestUser('Tester', 'test@example.com');
 
-        $filePath = FilePath::parse('test.txt');
-        $this->gitService->putAndCommitFile($user, $filePath, 'asdf', 'Added test.txt');
+        /* Test with spaces */
+
+        $filePath = FilePath::parse('A filename with spaces.txt');
+        $this->gitService->putAndCommitFile($user, $filePath, 'asdf', 'Added A filename with spaces.txt');
+        $this->assertTrue($this->gitService->exists($filePath));
+
+        $history = $this->gitService->getFileHistory($filePath);
+        $this->assertCount(1, $history);
+
+        /** @var CommitMetadata $firstEntry */
+        $firstEntry = $history[0];
+        $this->assertEquals('Added A filename with spaces.txt', $firstEntry->getMessage());
+        $this->assertEquals('test@example.com', $firstEntry->getEmail());
+        $this->assertEquals('Tester', $firstEntry->getCommitter());
+
+        /* Test with umlauts */
+
+        $filePath = FilePath::parse('A filename with Ümläuts.txt');
+        $this->gitService->putAndCommitFile($user, $filePath, 'asdf', 'Added A filename with Ümläuts.txt');
         $this->assertTrue($this->gitService->exists($filePath));
 
         $history = $this->gitService->getFileHistory($filePath);
         $this->assertCount(1, $history);
 
         /** @var CommitMetadata $firstEntry */
         $firstEntry = $history[0];
-        $this->assertEquals('Added test.txt', $firstEntry->getMessage());
+        $this->assertEquals('Added A filename with Ümläuts.txt', $firstEntry->getMessage());
         $this->assertEquals('test@example.com', $firstEntry->getEmail());
         $this->assertEquals('Tester', $firstEntry->getCommitter());
     }