From a1bb28f6ce8cc974034944f07c3ad4d0e3324992 Mon Sep 17 00:00:00 2001 From: Keith Hill Date: Wed, 25 Jan 2017 10:56:14 -0700 Subject: [PATCH] Fix Pester test failures. --- GitUtils.ps1 | 2 +- test/Get-GitStatus.Tests.ps1 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/GitUtils.ps1 b/GitUtils.ps1 index e992013f9..36f7c2519 100644 --- a/GitUtils.ps1 +++ b/GitUtils.ps1 @@ -188,7 +188,7 @@ function Get-GitStatus($gitDir = (Get-GitDirectory)) { $filesUnmerged = New-Object System.Collections.Generic.List[string] $stashCount = 0 - if($settings.EnableFileStatus -and !$(InDotGitOrBareRepoDir) -and !$(InDisabledRepository)) { + if($settings.EnableFileStatus -and !$(InDotGitOrBareRepoDir $gitDir) -and !$(InDisabledRepository)) { if ($settings.EnableFileStatusFromCache -eq $null) { $settings.EnableFileStatusFromCache = (Get-Module GitStatusCachePoshClient) -ne $null } diff --git a/test/Get-GitStatus.Tests.ps1 b/test/Get-GitStatus.Tests.ps1 index 77af7e46e..da93d6630 100644 --- a/test/Get-GitStatus.Tests.ps1 +++ b/test/Get-GitStatus.Tests.ps1 @@ -3,6 +3,8 @@ Describe 'Get-GitStatus Tests' { Context 'Get-GitStatus Working Directory Tests' { BeforeAll { + Set-Location $PSScriptRoot + function global:git { $cmdline = "$args" switch ($cmdline) {