Merge pull request chocolatey#2823 from corbob/a798-pin-package

Author: AdmiringWorm

src/chocolatey/infrastructure.app/services/PowershellService.cs

@@ -91,6 +91,9 @@ private IEnumerable<string> get_hook_scripts(ChocolateyConfiguration configurati
             // If skipping hook scripts, return an empty list
             if (configuration.SkipHookScripts) return hookScriptPaths;
 
+            // If hooks directory doesn't exist, return an empty list to prevent directory not exist warnings
+            if (!_fileSystem.directory_exists(ApplicationParameters.HooksLocation)) return hookScriptPaths;
+
             string filenameBase;
 
             if (isPreHook)

tests/chocolatey-tests/chocolatey.Tests.ps1

@@ -139,13 +139,7 @@ Describe "Ensuring Chocolatey is correctly installed" -Tag Environment, Chocolat
 
         # This is FossOnly for now as there are some undetermined errors here that do not seem to present inside of Chocolatey. https://gitlab.com/chocolatey/build-automation/chocolatey-test-kitchen/-/issues/39
         It "Should be able to run the script in AllSigned mode" -Skip:($_ -notin $PowerShellFiles) -Tag FossOnly {
-            # The chocolateyScriptRunner expects some passed in values and results in two errors if they're not there. This accounts for that.
-            $expectedErrors = if ($FileUnderTest.Name -eq 'chocolateyScriptRunner.ps1') {
-                2
-            }
-            else {
-                0
-            }
+            $expectedErrors = 0
             $command = "Import-Module $FileUnderTest -ErrorAction SilentlyContinue; exit `$error.count"
             & powershell.exe -noprofile -ExecutionPolicy AllSigned -command $command 2>$null
             $LastExitCode | Should -BeExactly $expectedErrors

tests/chocolatey-tests/choco-apikey.Tests.ps1 renamed to tests/chocolatey-tests/commands/choco-apikey.Tests.ps1

@@ -145,6 +145,7 @@ Describe "choco info" -Tag Chocolatey, InfoCommand {
 
     Context "Listing package information about local side by side installed package" {
         BeforeAll {
+            Restore-ChocolateyInstallSnapshot
             $null = Invoke-Choco install 'isdependency' --confirm --sxs
 
             $Output = Invoke-Choco info 'isdependency' --local-only

tests/chocolatey-tests/choco-config.Tests.ps1 renamed to tests/chocolatey-tests/commands/choco-config.Tests.ps1

@@ -1282,7 +1282,7 @@ Describe "choco install" -Tag Chocolatey, InstallCommand {
     }
 
     # Issue: https://github.com/chocolatey/chocolatey-licensed-issues/issues/284
-    Context "Installing a Package with Embedded Zip Archive and specifying destination <Name>" -Foreach @(
+    Context "Installing a Package with Embedded Zip Archive and specifying destination <Name>" -ForEach @(
         @{ Name = 'Root of UNC share' ; Path = '\\localhost\c$\' }
         @{ Name = 'UNC share path' ; Path = '\\localhost\c$\temp\' }
         @{ Name = 'Root of drive with trailing slash' ; Path = 'C:\' }
@@ -1393,6 +1393,37 @@ Describe "choco install" -Tag Chocolatey, InstallCommand {
         }
     }
 
+    Context "Install '<Package>' package with (<Command>) specified" -ForEach @(
+        @{ Command = '--pin' ; Package = 'installpackage' ; Contains = $true }
+        @{ Command = '' ; Package = 'installpackage' ; Contains = $false }
+        @{ Command = '' ; Package = 'packages.config' ; Contains = $true }
+    ) {
+        BeforeAll {
+            Restore-ChocolateyInstallSnapshot
+
+            if ($Package -eq 'packages.config') {
+                @"
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+    <package id="installpackage" pinPackage="true" />
+</packages>
+"@ | Set-Content $PWD/packages.config
+            }
+
+            $null = Invoke-Choco install $Package $Command --confirm
+            $Output = Invoke-Choco pin list
+        }
+
+        It "Output should include pinned package" {
+            if ($Contains) {
+                $Output.String | Should -Match "installpackage|1.0.0"
+            }
+            else {
+                $Output.String | Should -Not -Match "installpackage|1.0.0"
+            }
+        }
+    }
+
     Context "Installing package that extracts local zip archive while disabling logging" {
         BeforeAll {
             Restore-ChocolateyInstallSnapshot