Address most PR review issues.

I don't know that Pester will support a user-defined construct to encapuslate BeforeAll/AfterAll. But I did pull the guts out into shared functions.
dahlbyk · Feb 13, 2017 · 32c9a2b · 32c9a2b
1 parent 8440c88
commit 32c9a2b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 25 deletions.
diff --git a/src/GitTabExpansion.ps1 b/src/GitTabExpansion.ps1
@@ -52,8 +52,9 @@ catch {
 }
 
 filter quoteStringWithSpecialChars {
-    if ($_ -and ($_ -match '\s+|#|@|\$|;|\{|\}|\(|\)')) {
-        "'" + $_ + "'"
+    if ($_ -and ($_ -match '\s+|#|@|\$|;|,|''|\{|\}|\(|\)')) {
+        $str = $_ -replace "'", "''"
+        "'$str'"
     }
     else {
         $_

diff --git a/test/Shared.ps1 b/test/Shared.ps1
@@ -23,6 +23,28 @@ function MakeGitPath([string]$Path) {
     $Path -replace '\\', '/'
 }
 
+function NewGitTempRepo {
+    Push-Location
+    $temp = [System.IO.Path]::GetTempPath()
+    $repoPath = Join-Path $temp ([IO.Path]::GetRandomFileName())
+    git.exe init $repoPath *>$null
+    Set-Location $repoPath
+    $repoPath
+}
+
+function RemoveGitTempRepo($RepoPath) {
+    Pop-Location
+    if (Test-Path $repoPath) {
+        Remove-Item $repoPath -Recurse -Force
+    }
+}
+
+function ResetGitTempRepoWorkingDir($RepoPath, $Branch = 'master') {
+    Set-Location $repoPath
+    git.exe reset HEAD --hard
+    git.exe checkout $Branch 2>$null
+}
+
 # Force the posh-git prompt to be installed. Could be runnng on dev system where
 # user has customized the prompt.
 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]

diff --git a/test/TabExpansion.Tests.ps1 b/test/TabExpansion.Tests.ps1
@@ -120,21 +120,14 @@ Describe 'TabExpansion Tests' {
             }
         }
     }
+
     Context 'Add/Reset/Checkout TabExpansion Tests' {
         BeforeEach {
             [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
-            $origPath = Get-Location
-            $temp = [System.IO.Path]::GetTempPath()
-            $repoPath = Join-Path $temp ([IO.Path]::GetRandomFileName())
-
-            git.exe init $repoPath
-            Set-Location $repoPath
+            $repoPath = NewGitTempRepo
         }
         AfterEach {
-            Set-Location $origPath
-            if (Test-Path $repoPath) {
-                Remove-Item $repoPath -Recurse -Force
-            }
+            RemoveGitTempRepo $repoPath
         }
         It 'Tab completes non-ASCII file name' {
             git.exe config core.quotepath true # Problematic (default) config
@@ -152,27 +145,17 @@ Describe 'TabExpansion Tests' {
     Context 'PowerShell Special Chars Tests' {
         BeforeAll {
             [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
-            $origPath = Get-Location
-            $temp = [System.IO.Path]::GetTempPath()
-            $repoPath = Join-Path $temp ([IO.Path]::GetRandomFileName())
-
-            git.exe init $repoPath
-            Set-Location $repoPath
+            $repoPath = NewGitTempRepo
 
             'readme' | Out-File .\README.md -Encoding ascii
             git.exe add .\README.md
             git.exe commit -m "initial commit."
         }
         AfterAll {
-            Set-Location $origPath
-            if (Test-Path $repoPath) {
-                Remove-Item $repoPath -Recurse -Force
-            }
+            RemoveGitTempRepo $repoPath
         }
         AfterEach {
-            Set-Location $repoPath
-            git.exe reset HEAD --hard
-            git.exe checkout master 2>$null
+            ResetGitTempRepoWorkingDir $repoPath
         }
         It 'Tab completes branch name with special char as quoted' {
             git.exe branch '#develop' 2>$null
@@ -193,6 +176,12 @@ Describe 'TabExpansion Tests' {
             $result = & $module GitTabExpansionInternal 'git show v1'
             $result | Should BeExactly "'$tag'"
         }
+        It 'Tab completes a tag name with single quote correctly' {
+            git.exe tag "v2.0.0'"
+
+            $result = & $module GitTabExpansionInternal 'git show v2'
+            $result | Should BeExactly "'v2.0.0'''"
+        }
         It 'Tab completes add file in working dir with special char as quoted' {
             $filename = 'foo{bar} (x86).txt';
             New-Item $filename -ItemType File