(maint) Changes during pairing session

During a pairing session between Kim and Gary, some changes were made to
the PR. These weren't particularly involved changes, but minor tweaks
based on the review.

Author: gep13

Invoke-Tests.ps1

@@ -1,4 +1,4 @@
-#Requires -Module @{ ModuleName = 'pester'; ModuleVersion = '5.3.1' }
+#Requires -Module @{ ModuleName = 'pester'; ModuleVersion = '5.3.1' }
 #Requires -RunAsAdministrator
 <#
     .SYNOPSIS

tests/Vagrantfile

@@ -69,7 +69,7 @@ Vagrant.configure("2") do |config|
     Push-Location c:/code/choco
     # $env:TEST_KITCHEN = 1
     $env:VM_RUNNING = 1
-    ./Invoke-Tests.ps1 -SkipPackaging
+    ./Invoke-Tests.ps1
     Copy-Item $env:ALLUSERSPROFILE/chocolatey/logs/testInvocations.log C:/vagrant
   SHELL
 end

tests/chocolatey-tests/commands/choco-info.Tests.ps1

@@ -196,6 +196,8 @@
     }
 
     Context "Listing package information for non-normalized exact package version" -ForEach @(
+        @{ ExpectedPackageVersion = '1.0.0' ; SearchVersion = '1' }
+        @{ ExpectedPackageVersion = '1.0.0' ; SearchVersion = '1.0' }
         @{ ExpectedPackageVersion = '1.0.0' ; SearchVersion = '1.0.0' }
         @{ ExpectedPackageVersion = '4.0.1' ; SearchVersion = '4.0.1' }
         @{ ExpectedPackageVersion = '1.0.0' ; SearchVersion = '01.0.0.0' }

tests/chocolatey-tests/commands/choco-install.Tests.ps1

@@ -1,4 +1,4 @@
-Describe "choco install" -Tag Chocolatey, InstallCommand {
+Describe "choco install" -Tag Chocolatey, InstallCommand {
     BeforeDiscovery {
         $isLicensed30OrMissingVersion = Test-PackageIsEqualOrHigher 'chocolatey.extension' '3.0.0-beta' -AllowMissingPackage
         $licensedProxyFixed = Test-PackageIsEqualOrHigher 'chocolatey.extension' 2.2.0-beta -AllowMissingPackage
@@ -1775,6 +1775,8 @@ To install a local, or remote file, you may use:
     }
 
     Context "Installing a package with a non-normalized version number" -ForEach @(
+        @{ ExpectedPackageVersion = '1.0.0' ; SearchVersion = '1' ; NuspecVersion = '01.0.0.0'}
+        @{ ExpectedPackageVersion = '1.0.0' ; SearchVersion = '1.0' ; NuspecVersion = '01.0.0.0'}
         @{ ExpectedPackageVersion = '1.0.0' ; SearchVersion = '1.0.0' ; NuspecVersion = '01.0.0.0' }
         @{ ExpectedPackageVersion = '4.0.1' ; SearchVersion = '4.0.1' ; NuspecVersion = '004.0.01.0' }
         @{ ExpectedPackageVersion = '1.0.0' ; SearchVersion = '01.0.0.0' ; NuspecVersion = '01.0.0.0' }
@@ -1783,15 +1785,10 @@ To install a local, or remote file, you may use:
     )  {
         BeforeAll {
             Restore-ChocolateyInstallSnapshot
-            Push-Location (New-Item "$(Get-TempDirectory)/$(New-Guid)" -ItemType Directory)
             $PackageUnderTest = 'nonnormalizedversions'
             $Output = Invoke-Choco install $PackageUnderTest --Version $SearchVersion
         }
 
-        AfterAll {
-            Pop-Location
-        }
-
         It "Should exit with success (0)" {
             $Output.ExitCode | Should -Be 0 -Because $Output.String
         }

tests/chocolatey-tests/commands/choco-pack.Tests.ps1

@@ -591,6 +591,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         @{ ExpectedPackageVersion = '1.2.4' ; ProvidedVersion = '01.02.04' }
         @{ ExpectedPackageVersion = '1.2.0' ; ProvidedVersion = '01.02' }
         @{ ExpectedPackageVersion = '1.2.3' ; ProvidedVersion = '0001.0002.0003' }
+        @{ ExpectedPackageVersion = '2.0.0' ; ProvidedVersion = '02' }
     )  {
         BeforeAll {
             Restore-ChocolateyInstallSnapshot

tests/chocolatey-tests/commands/choco-uninstall.Tests.ps1

@@ -430,10 +430,6 @@ Describe "choco uninstall" -Tag Chocolatey, UninstallCommand {
             $Output = Invoke-Choco uninstall $PackageUnderTest
         }
 
-        AfterAll {
-            Pop-Location
-        }
-
         It "Should exit with success (0)" {
             $Output.ExitCode | Should -Be 0 -Because $Output.String
         }

tests/chocolatey-tests/commands/choco-upgrade.Tests.ps1

@@ -1,4 +1,4 @@
-Describe "choco upgrade" -Tag Chocolatey, UpgradeCommand {
+Describe "choco upgrade" -Tag Chocolatey, UpgradeCommand {
     BeforeAll {
         Remove-NuGetPaths
         Initialize-ChocolateyTestInstall