Merge pull request #494 from dahlbyk/rkeithhill/pester-update-master2

Move appveyor build to Pester 4 (again)
dahlbyk · Sep 29, 2017 · b1c4e97 · b1c4e97
2 parents 53c9145 + 4c37f1a
commit b1c4e97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -13,7 +13,7 @@
 
 	// Start PowerShell
     "windows": {
-        "command": "${env.windir}\\sysnative\\windowspowershell\\v1.0\\PowerShell.exe"
+        "command": "${env:windir}\\System32\\windowspowershell\\v1.0\\PowerShell.exe"
     },
     "linux": {
         "command": "/usr/bin/powershell"
@@ -43,24 +43,7 @@
                 "Write-Host 'Invoking Pester'; Invoke-Pester test -PesterOption @{IncludeVSCodeMarker=$true};",
                 "Invoke-Command { Write-Host 'Completed Test task in task runner.' }"
             ],
-            "problemMatcher": [
-                {
-                    "owner": "powershell",
-                    "fileLocation": ["absolute"],
-                    "severity": "error",
-                    "pattern": [
-                        {
-                            "regexp": "^\\s*(\\[-\\]\\s*.*?)(\\d+)ms\\s*$",
-                            "message": 1
-                        },
-                        {
-                            "regexp": "^\\s+at\\s+[^,]+,\\s*(.*?):\\s+line\\s+(\\d+)$",
-                            "file": 1,
-                            "line": 2
-                        }
-                    ]
-                }
-            ]
+            "problemMatcher": "$pester"
         }
 	]
 }
diff --git a/appveyor.yml b/appveyor.yml
@@ -15,7 +15,7 @@ init:
 install:
   - ps: |
       Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null
-      Install-Module Pester -MinimumVersion 3.4.0 -MaximumVersion 3.99.99 -Scope CurrentUser -Force | Out-Null
+      Install-Module Pester -MinimumVersion 4.0.8 -MaximumVersion 4.99.99 -Scope CurrentUser -Force | Out-Null
       "Git version: $(git.exe --version)"
       "PSVersion:   $($PSVersionTable.PSVersion), build: $($PSVersionTable.BuildVersion), clr version: $($PSVersionTable.ClrVersion)"
       "Host name:   $($Host.Name)"

diff --git a/test/Utils.Tests.ps1 b/test/Utils.Tests.ps1
@@ -58,7 +58,7 @@ Describe 'Utils Function Tests' {
             Add-PoshGitToProfile $childProfilePath
 
             Test-Path -LiteralPath $childProfilePath | Should Be $true
-            $childProfilePath | Should Contain "^Import-Module .*posh-git"
+            $childProfilePath | Should FileContentMatch "^Import-Module .*posh-git"
         }
         It 'Does not modify profile that already refers to posh-git' {
             $profileContent = @'