Skip to content

Make Move-Item work with its -Include, -Exclude, and -Filter parameters #3878

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
TravisEz13 merged 4 commits into from
Jun 23, 2017
Merged

Make Move-Item work with its -Include, -Exclude, and -Filter parameters #3878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83b2d6e
Make Move-Item work with its -Include, -Exclude, and -Filter paramete…
May 29, 2017
5cc46d9
Update tests per code review.
May 30, 2017
992fe42
Changes per code review.
Jun 5, 2017
970efa0
Remove stray comment
Jun 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 @@ -3510,7 +3510,7 @@ private Collection<PathInfo> GetResolvedPaths(string path)
Collection<PathInfo> results = new Collection<PathInfo>();
try
{
results = SessionState.Path.GetResolvedPSPathFromPSPath(path);
results = SessionState.Path.GetResolvedPSPathFromPSPath(path, CmdletProviderContext);
}
catch (PSNotSupportedException notSupported)
{
Expand Down
87 changes: 87 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Move-Item.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,91 @@ Describe "Move-Item tests" -Tag "CI" {
test-path $target | Should be $true
"$target" | Should ContainExactly "This is content"
}

Context "Move-Item with filters" {
BeforeAll {
$filterPath = "$TESTDRIVE/filterTests"
$moveToPath = "$TESTDRIVE/dest-dir"
$renameToPath = Join-Path $filterPath "move.txt"
$filePath = Join-Path $filterPath "*"
$fooFile = "foo.txt"
$barFile = "bar.txt"
$booFile = "boo.txt"
$fooPath = Join-Path $filterPath $fooFile
$barPath = Join-Path $filterPath $barFile
$booPath = Join-Path $filterPath $booFile
$newFooPath = Join-Path $moveToPath $fooFile
$newBarPath = Join-Path $moveToPath $barFile
$newBooPath = Join-Path $moveToPath $booFile
$fooContent = "foo content"
$barContent = "bar content"
$booContent = "boo content"
}
BeforeEach {
New-Item -ItemType Directory -Path $filterPath | Out-Null
New-Item -ItemType Directory -Path $moveToPath | Out-Null
New-Item -ItemType File -Path $fooPath -Value $fooContent | Out-Null
New-Item -ItemType File -Path $barPath -Value $barContent | Out-Null
New-Item -ItemType File -Path $booPath -Value $booContent | Out-Null
}
AfterEach {
Remove-Item $filterPath -Recurse -Force -ErrorAction SilentlyContinue
Remove-Item $moveToPath -Recurse -Force -ErrorAction SilentlyContinue
}
It "Can move to different directory, filtered with -Include" {
Move-Item -Path $filePath -Destination $moveToPath -Include "bar*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$barPath | Should Not Exist
$newBarPath | Should Exist
$booPath | Should Exist
$fooPath | Should Exist
$newBarPath | Should ContainExactly $barContent
}
It "Can move to different directory, filtered with -Exclude" {
Move-Item -Path $filePath -Destination $moveToPath -Exclude "b*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$fooPath | Should Not Exist
$newFooPath | Should Exist
$booPath | Should Exist
$barPath | Should Exist
$newFooPath | Should ContainExactly $fooContent
}
It "Can move to different directory, filtered with -Filter" {
Move-Item -Path $filePath -Destination $moveToPath -Filter "bo*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$booPath | Should Not Exist
$newBooPath | Should Exist
$barPath | Should Exist
$fooPath | Should Exist
$newBooPath | Should ContainExactly $booContent
}

It "Can rename via move, filtered with -Include" {
Move-Item -Path $filePath -Destination $renameToPath -Include "bar*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$renameToPath | Should Exist
$barPath | Should Not Exist
$booPath | Should Exist
$fooPath | Should Exist
$renameToPath | Should ContainExactly $barContent
}
It "Can rename via move, filtered with -Exclude" {
Move-Item -Path $filePath -Destination $renameToPath -Exclude "b*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$renameToPath | Should Exist
$fooPath | Should Not Exist
$booPath | Should Exist
$barPath | Should Exist
$renameToPath | Should ContainExactly $fooContent
}
It "Can rename via move, filtered with -Filter" {
Move-Item -Path $filePath -Destination $renameToPath -Filter "bo*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$renameToPath | Should Exist
$booPath | Should Not Exist
$fooPath | Should Exist
$barPath | Should Exist
$renameToPath | Should ContainExactly $booContent
}
}
}