Skip to content

Replace Pester submodule by download from the gallery #4618

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

Closed
vors wants to merge 2 commits into from
Closed

Replace Pester submodule by download from the gallery #4618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcf2b52
Replace Pester by download from the gallery
vors Aug 19, 2017
c75e2f3
Pester tests updated due to braking changes between Pester 3.x and > …
it-praktyk Dec 13, 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
76 changes: 5 additions & 71 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ Fix steps:
# - PowerShellGet, PackageManagement, Microsoft.PowerShell.Archive
if($PSModuleRestore)
{
Restore-PSModuleToBuild -PublishPath $publishPath -CI:$CI.IsPresent
Restore-PSModuleToBuild -PublishPath $publishPath
}
}

Expand All @@ -641,9 +641,7 @@ function Restore-PSModuleToBuild
param(
[Parameter(Mandatory)]
[string]
$PublishPath,
[Switch]
$CI
$PublishPath
)

$ProgressPreference = "SilentlyContinue"
Expand All @@ -656,25 +654,10 @@ function Restore-PSModuleToBuild
# PowerShellGet depends on PackageManagement module, so PackageManagement module will be installed with the PowerShellGet module.
'PowerShellGet'
'Microsoft.PowerShell.Archive'
'Pester'
) -SourceLocation "https://www.powershellgallery.com/api/v2/"

if($CI.IsPresent)
{
Restore-PSPester -Destination $modulesDir
}
}

function Restore-PSPester
{
param
(
[ValidateNotNullOrEmpty()]
[string]
$Destination = ([IO.Path]::Combine((Split-Path (Get-PSOptions -DefaultToNew).Output), "Modules"))
)

Restore-GitModule -Destination $Destination -Uri 'https://github.com/PowerShell/psl-pester' -Name Pester -CommitSha '1f546b6aaa0893e215e940a14f57c96f56f7eff1'
}
function Compress-TestContent {
[CmdletBinding()]
param(
Expand Down Expand Up @@ -984,10 +967,9 @@ function Start-PSPester {
{
Write-Warning @"
Pester module not found.
Restore the module to '$Pester' by running:
Restore-PSPester
Install-Module Pester
"@
return;
return
}

if ($IncludeFailingTest.IsPresent)
Expand Down Expand Up @@ -2403,54 +2385,6 @@ function Clear-PSRepo
}
}


# Install PowerShell modules from a git Repo such as PSL-Pester
function Restore-GitModule
{
[CmdletBinding()]
param(
[Parameter(Mandatory=$true)]
[ValidateNotNullOrEmpty()]
[string]$Name,

[Parameter(Mandatory=$true)]
[ValidateNotNullOrEmpty()]
[string]$Uri,

[Parameter(Mandatory=$true)]
[ValidateNotNullOrEmpty()]
[string]$Destination,

[Parameter(Mandatory=$true)]
[ValidateNotNullOrEmpty()]
[string]$CommitSha
)

log 'Restoring module from git repo:'
log ("Name='{0}', Destination='{1}', Uri='{2}', CommitSha='{3}'" -f $Name, $Destination, $Uri, $CommitSha)

$clonePath = Join-Path -Path $Destination -ChildPath $Name
if(Test-Path $clonePath)
{
remove-Item -Path $clonePath -recurse -force
}

$null = Start-NativeExecution {git clone --quiet $uri $clonePath}

Push-location $clonePath
try {
$null = Start-NativeExecution {git checkout --quiet -b desiredCommit $CommitSha} -SuppressOutput

$gitItems = Join-Path -Path $clonePath -ChildPath '.git*'
$ymlItems = Join-Path -Path $clonePath -ChildPath '*.yml'
Get-ChildItem -attributes hidden,normal -Path $gitItems, $ymlItems | Remove-Item -Recurse -Force
}
finally
{
pop-location
}
}

# Install PowerShell modules such as PackageManagement, PowerShellGet
function Restore-PSModule
{
Expand Down
2 changes: 1 addition & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Core/Out-Default.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Describe "Out-Default Tests" -tag CI {
"@

& $powershell -noprofile -command $script | Should BeExactly 'bye'
"TestDrive:\transcript.txt" | Should Contain 'hello'
"TestDrive:\transcript.txt" | Should -FileContentMatch 'hello'
}

It "Out-Default reverts transcription state when used more than once in a pipeline" {
Expand Down
2 changes: 1 addition & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Management/Clear-Content.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Describe "Clear-Content cmdlet tests" -Tags "CI" {
# we could suppress the WhatIf output here if we use the testhost, but it's not necessary
It "The filesystem provider supports should process" -skip:(!$IsWindows) {
clear-content TESTDRIVE:\$file2 -WhatIf
"TESTDRIVE:\$file2" | should contain "This is content"
"TESTDRIVE:\$file2" | Should -FileContentMatch "This is content"
}

It "The filesystem provider should support ShouldProcess (reference ProviderSupportsShouldProcess member)" {
Expand Down
14 changes: 7 additions & 7 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 @@ -9,7 +9,7 @@ Describe "Move-Item tests" -Tag "CI" {
Move-Item $source $target
test-path $source | Should be $false
test-path $target | Should be $true
"$target" | Should ContainExactly "This is content"
"$target" | Should -FileContentMatchExactly "This is content"
}

Context "Move-Item with filters" {
Expand Down Expand Up @@ -49,7 +49,7 @@ Describe "Move-Item tests" -Tag "CI" {
$newBarPath | Should Exist
$booPath | Should Exist
$fooPath | Should Exist
$newBarPath | Should ContainExactly $barContent
$newBarPath | Should -FileContentMatchExactly $barContent
}
It "Can move to different directory, filtered with -Exclude" {
Move-Item -Path $filePath -Destination $moveToPath -Exclude "b*" -ErrorVariable e -ErrorAction SilentlyContinue
Expand All @@ -58,7 +58,7 @@ Describe "Move-Item tests" -Tag "CI" {
$newFooPath | Should Exist
$booPath | Should Exist
$barPath | Should Exist
$newFooPath | Should ContainExactly $fooContent
$newFooPath | Should -FileContentMatchExactly $fooContent
}
It "Can move to different directory, filtered with -Filter" {
Move-Item -Path $filePath -Destination $moveToPath -Filter "bo*" -ErrorVariable e -ErrorAction SilentlyContinue
Expand All @@ -67,7 +67,7 @@ Describe "Move-Item tests" -Tag "CI" {
$newBooPath | Should Exist
$barPath | Should Exist
$fooPath | Should Exist
$newBooPath | Should ContainExactly $booContent
$newBooPath | Should -FileContentMatchExactly $booContent
}

It "Can rename via move, filtered with -Include" {
Expand All @@ -77,7 +77,7 @@ Describe "Move-Item tests" -Tag "CI" {
$barPath | Should Not Exist
$booPath | Should Exist
$fooPath | Should Exist
$renameToPath | Should ContainExactly $barContent
$renameToPath | Should -FileContentMatchExactly $barContent
}
It "Can rename via move, filtered with -Exclude" {
Move-Item -Path $filePath -Destination $renameToPath -Exclude "b*" -ErrorVariable e -ErrorAction SilentlyContinue
Expand All @@ -86,7 +86,7 @@ Describe "Move-Item tests" -Tag "CI" {
$fooPath | Should Not Exist
$booPath | Should Exist
$barPath | Should Exist
$renameToPath | Should ContainExactly $fooContent
$renameToPath | Should -FileContentMatchExactly $fooContent
}
It "Can rename via move, filtered with -Filter" {
Move-Item -Path $filePath -Destination $renameToPath -Filter "bo*" -ErrorVariable e -ErrorAction SilentlyContinue
Expand All @@ -95,7 +95,7 @@ Describe "Move-Item tests" -Tag "CI" {
$booPath | Should Not Exist
$fooPath | Should Exist
$barPath | Should Exist
$renameToPath | Should ContainExactly $booContent
$renameToPath | Should -FileContentMatchExactly $booContent
}
}
}
2 changes: 1 addition & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Management/Rename-Item.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ Describe "Rename-Item tests" -Tag "CI" {
Rename-Item $source $target
test-path $source | Should be $false
test-path $target | Should be $true
"$target" | Should ContainExactly "This is content"
"$target" | Should -FileContentMatchExactly "This is content"
}
}
36 changes: 18 additions & 18 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Alias.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,46 +63,46 @@ Describe "Export-Alias DRT Unit Tests" -Tags "CI" {

It "Export-Alias for Default"{
Export-Alias $fulltestpath abcd01 -passthru
$fulltestpath| Should ContainExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should -FileContentMatchExactly '"abcd01","efgh01","","None"'
}

It "Export-Alias As CSV"{
Export-Alias $fulltestpath abcd01 -As CSV -passthru
$fulltestpath| Should ContainExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should -FileContentMatchExactly '"abcd01","efgh01","","None"'
}

It "Export-Alias As CSV With Description"{
Export-Alias $fulltestpath abcd01 -As CSV -description "My Aliases" -passthru
$fulltestpath| Should ContainExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should ContainExactly "My Aliases"
$fulltestpath| Should -FileContentMatchExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should -FileContentMatchExactly "My Aliases"
}

It "Export-Alias As CSV With Multiline Description"{
Export-Alias $fulltestpath abcd01 -As CSV -description "My Aliases\nYour Aliases\nEveryones Aliases" -passthru
$fulltestpath| Should ContainExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should ContainExactly "My Aliases"
$fulltestpath| Should ContainExactly "Your Aliases"
$fulltestpath| Should ContainExactly "Everyones Aliases"
$fulltestpath| Should -FileContentMatchExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should -FileContentMatchExactly "My Aliases"
$fulltestpath| Should -FileContentMatchExactly "Your Aliases"
$fulltestpath| Should -FileContentMatchExactly "Everyones Aliases"
}

It "Export-Alias As Script"{
Export-Alias $fulltestpath abcd01 -As Script -passthru
$fulltestpath| Should ContainExactly 'set-alias -Name:"abcd01" -Value:"efgh01" -Description:"" -Option:"None"'
$fulltestpath| Should -FileContentMatchExactly 'set-alias -Name:"abcd01" -Value:"efgh01" -Description:"" -Option:"None"'
}

It "Export-Alias As Script With Multiline Description"{
Export-Alias $fulltestpath abcd01 -As Script -description "My Aliases\nYour Aliases\nEveryones Aliases" -passthru
$fulltestpath| Should ContainExactly 'set-alias -Name:"abcd01" -Value:"efgh01" -Description:"" -Option:"None"'
$fulltestpath| Should ContainExactly "My Aliases"
$fulltestpath| Should ContainExactly "Your Aliases"
$fulltestpath| Should ContainExactly "Everyones Aliases"
$fulltestpath| Should -FileContentMatchExactly 'set-alias -Name:"abcd01" -Value:"efgh01" -Description:"" -Option:"None"'
$fulltestpath| Should -FileContentMatchExactly "My Aliases"
$fulltestpath| Should -FileContentMatchExactly "Your Aliases"
$fulltestpath| Should -FileContentMatchExactly "Everyones Aliases"
}

It "Export-Alias for Force Test"{
Export-Alias $fulltestpath abcd01
Export-Alias $fulltestpath abcd02 -force
$fulltestpath| Should Not ContainExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should ContainExactly '"abcd02","efgh02","","None"'
$fulltestpath| Should -Not -FileContentMatchExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should -FileContentMatchExactly '"abcd02","efgh02","","None"'
}

It "Export-Alias for Force ReadOnly Test" {
Expand All @@ -124,9 +124,9 @@ Describe "Export-Alias DRT Unit Tests" -Tags "CI" {
$_.FullyQualifiedErrorId | Should be "FileOpenFailure,Microsoft.PowerShell.Commands.ExportAliasCommand"
}
Export-Alias $fulltestpath abcd03 -force
$fulltestpath| Should Not ContainExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should Not ContainExactly '"abcd02","efgh02","","None"'
$fulltestpath| Should ContainExactly '"abcd03","efgh03","","None"'
$fulltestpath| Should -Not -FileContentMatchExactly '"abcd01","efgh01","","None"'
$fulltestpath| Should -Not -FileContentMatchExactly '"abcd02","efgh02","","None"'
$fulltestpath| Should -FileContentMatchExactly '"abcd03","efgh03","","None"'

if ( $IsWindows )
{
Expand Down
4 changes: 2 additions & 2 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Out-File.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Describe "Out-File DRT Unit Tests" -Tags "CI" {
$tempFile = Join-Path -Path $TestDrive -ChildPath "outfileAppendTest.txt"
{ 'This is first line.' | out-file $tempFile } | Should Not Throw
{ 'This is second line.' | out-file -append $tempFile } | Should Not Throw
$tempFile |Should Contain "first"
$tempFile |Should Contain "second"
$tempFile |Should -FileContentMatch "first"
$tempFile |Should -FileContentMatch "second"
Remove-Item $tempFile -Force
}
}
Expand Down
8 changes: 4 additions & 4 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-Event.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ Describe "Remove-Event" -Tags "CI" {

It "Should remove an event given a sourceidentifier" {
{ Remove-Event -sourceidentifier PesterTimer }
{ Get-Event -ErrorAction SilentlyContinue | Should Not Contain PesterTimer }
{ Get-Event -ErrorAction SilentlyContinue | Should -Not -FileContentMatch PesterTimer }
}

It "Should remove an event given an event identifier" {
{ $events = Get-Event -sourceidentifier PesterTimer }
{ $events = $events.EventIdentifier }
{ Remove-Event -EventIdentifier $events }
{ $events = Get-Event -ErrorAction SilentlyContinue}
{ $events.SourceIdentifier | Should Not Contain "PesterTimer" }
{ $events.SourceIdentifier | Should -Not -FileContentMatch "PesterTimer" }
}

It "Should be able to remove an event given a pipe from Get-Event" {
{ Get-Event -sourceidentifier PesterTimer | Remove-Event }
{ Get-Event -ErrorAction SilentlyContinue | Should Not Contain "PesterTimer" }
{ Get-Event -ErrorAction SilentlyContinue | Should -Not -FileContentMatch "PesterTimer" }

}

It "Should NOT remove an event given the whatif flag" {
{ Remove-Event -sourceidentifier PesterTimer -whatif }
{ $events = Get-Event }
{ $events.SourceIdentifier | Should Contain "PesterTimer" }
{ $events.SourceIdentifier | Should -FileContentMatch "PesterTimer" }
}
}
}
12 changes: 6 additions & 6 deletions test/powershell/Modules/Microsoft.Powershell.Host/Start-Transcript.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Describe "Start-Transcript, Stop-Transcript tests" -tags "CI" {
$ps.addscript("Stop-Transcript").Invoke()

Test-Path $outputFilePath | Should be $true
$outputFilePath | should contain "Get-Date"
$outputFilePath | Should -FileContentMatch "Get-Date"
if($append) {
$outputFilePath | Should contain $content
$outputFilePath | Should -FileContentMatch $content
}
}
} finally {
Expand Down Expand Up @@ -122,7 +122,7 @@ Describe "Start-Transcript, Stop-Transcript tests" -tags "CI" {
}

Test-Path $transcriptFilePath | Should be $true
$transcriptFilePath | Should contain "After Dispose"
$transcriptFilePath | Should -FileContentMatch "After Dispose"
}

It "Transcription should be closed if the only runspace gets closed" {
Expand All @@ -131,8 +131,8 @@ Describe "Start-Transcript, Stop-Transcript tests" -tags "CI" {
Invoke-Expression $powerShellCommand

Test-Path $transcriptFilePath | Should be $true
$transcriptFilePath | Should contain "Before Dispose"
$transcriptFilePath | Should contain "PowerShell transcript end"
$transcriptFilePath | Should -FileContentMatch "Before Dispose"
$transcriptFilePath | Should -FileContentMatch "PowerShell transcript end"
}

It "Transcription should record native command output" {
Expand All @@ -144,6 +144,6 @@ Describe "Start-Transcript, Stop-Transcript tests" -tags "CI" {
Test-Path $transcriptFilePath | Should be $true

$machineName = [System.Environment]::MachineName
$transcriptFilePath | Should contain $machineName
$transcriptFilePath | Should -FileContentMatch $machineName
}
}
2 changes: 1 addition & 1 deletion test/powershell/engine/Basic/CommandDiscovery.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

foreach($command in $commands)
{
$command.GetType().Name | should be @("AliasInfo","FunctionInfo","CmdletInfo","FilterInfo")
$command.GetType().Name | Should BeIn @("AliasInfo","FunctionInfo","CmdletInfo","FilterInfo")
}
}

Expand Down