Skip to content

fix detection of whether -LiteralPath was used to suppress wildcardexpansion for navigation cmdlets #5038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 3 commits into from
Oct 9, 2017
Merged

fix detection of whether -LiteralPath was used to suppress wildcardexpansion for navigation cmdlets #5038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3126e3
[feature]
SteveL-MSFT Oct 6, 2017
ceb9efa
[feature]
SteveL-MSFT Oct 6, 2017
d6cdf0d
[feature]
SteveL-MSFT Oct 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3107,7 +3107,7 @@ protected override void ProcessRecord()
try
{
resolvedPSPaths = SessionState.Path.GetResolvedPSPathFromPSPath(path, currentContext);
if (null != LiteralPath && 0 == resolvedPSPaths.Count)
if (true == SuppressWildcardExpansion && 0 == resolvedPSPaths.Count)
{
ItemNotFoundException pathNotFound =
new ItemNotFoundException(
Expand Down
34 changes: 32 additions & 2 deletions test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,25 @@ Describe "Handling of globbing patterns" -Tags "CI" {
Copy-Item -LiteralPath $file.FullName -Destination $newPath
Test-Path -LiteralPath $newPath | Should Be $true
}
}

It "Remove-Item -LiteralPath should fail if it contains asterisk" {
Context "Handle asterisks in name" {
It "Remove-Item -LiteralPath should fail if it contains asterisk and file doesn't exist" {
{ Remove-Item -LiteralPath ./foo*.txt -ErrorAction Stop } | ShouldBeErrorId "PathNotFound,Microsoft.PowerShell.Commands.RemoveItemCommand"
}

It "Remove-Item -LiteralPath should succeed for file with asterisk in name" -Skip:($IsWindows) {
$testPath = "$testdrive\foo*"
$testPath2 = "$testdrive\foo*2"
New-Item -Path $testPath -ItemType File
New-Item -Path $testPath2 -ItemType File
Test-Path -LiteralPath $testPath | Should Be $true
Test-Path -LiteralPath $testPath2 | Should Be $true
{ Remove-Item -LiteralPath $testPath } | Should Not Throw
Test-Path -LiteralPath $testPath | Should Be $false
# make sure wildcard wasn't applied so this file should still exist
Test-Path -LiteralPath $testPath2 | Should Be $true
}
}
}

Expand Down Expand Up @@ -989,7 +1004,7 @@ Describe "Extended FileSystem Item/Content Cmdlet Provider Tests" -Tags "Feature

It "Verify Filter" {
Remove-Item "TestDrive:\*" -Filter "*.txt"
$result = Get-Item "*.txt"
$result = Get-Item "TestDrive:\*.txt"
$result | Should BeNullOrEmpty
}

Expand All @@ -1009,6 +1024,21 @@ Describe "Extended FileSystem Item/Content Cmdlet Provider Tests" -Tags "Feature
$file1 | Should BeNullOrEmpty
$file2.Name | Should Be $testFile2
}

It "Verify Path can accept wildcard" {
Remove-Item "TestDrive:\*.txt" -Recurse -Force
$result = Get-ChildItem "TestDrive:\*.txt"
$result | Should BeNullOrEmpty
}

It "Verify no error if wildcard doesn't match: <path>" -TestCases @(
@{path="TestDrive:\*.foo"},
@{path="TestDrive:\[z]"},
@{path="TestDrive:\z.*"}
) {
param($path)
{ Remove-Item $path } | Should Not Throw
}
}

Context "Valdiate Set-Content parameters" {
Expand Down