fix(shim-test): Remove unused shim files (ScoopInstaller#4726)

se35710 · Mar 8, 2022 · b19670e · b19670e
1 parent 7386eed
commit b19670e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,8 +19,9 @@
   - **decompress:** Fix `Split-Path -LeafBase` in PS5 ([#4639](https://github.com/ScoopInstaller/Scoop/issues/4639))
 - **installed:** Fix 'core/installed' that mark failed app as 'installed' ([#4650](https://github.com/ScoopInstaller/Scoop/issues/4650))
   - **status:** Correctly handle failed installation of apps ([#4676](https://github.com/ScoopInstaller/Scoop/issues/4676))
-    - **test:** Import 'versions.ps1' in `Scoop-Decompress.Tests.ps1` ([#4689](https://github.com/ScoopInstaller/Scoop/issues/4689))
+  - **test:** Import 'versions.ps1' in `Scoop-Decompress.Tests.ps1` ([#4689](https://github.com/ScoopInstaller/Scoop/issues/4689))
 - **no-junctions:** Fix error when `NO_JUNCTIONS` is been set ([#4722](https://github.com/ScoopInstaller/Scoop/issues/4722))
+  - **test:** Remove unused shim files ([#4726](https://github.com/ScoopInstaller/Scoop/issues/4726))
 - **shim:** Fix PS1 shim error when in different drive in PS7 ([#4614](https://github.com/ScoopInstaller/Scoop/issues/4614))
 - **shim:** Fix `sh` shim error in WSL ([#4637](https://github.com/ScoopInstaller/Scoop/issues/4637))
 - **versions:** Fix wrong version number when only one version dir ([#4679](https://github.com/ScoopInstaller/Scoop/issues/4679))

diff --git a/test/Scoop-Core.Tests.ps1 b/test/Scoop-Core.Tests.ps1
@@ -251,9 +251,12 @@ Describe 'get_app_name_from_shim' -Tag 'Scoop' {
         get_app_name_from_shim "$working_dir/mock-shim.ps1" | Should -Be ''
     }
 
-    AfterEach {
-        if (Get-Command 'shim-test' -ErrorAction SilentlyContinue) {
-            rm_shim 'shim-test' $shimdir -ErrorAction SilentlyContinue
+    AfterAll {
+        if (Get-Command 'shim-test1' -ErrorAction SilentlyContinue) {
+            rm_shim 'shim-test1' $shimdir -ErrorAction SilentlyContinue
+        }
+        if (Get-Command 'shim-test2' -ErrorAction SilentlyContinue) {
+            rm_shim 'shim-test2' $shimdir -ErrorAction SilentlyContinue
         }
         Remove-Item -Force -Recurse -ErrorAction SilentlyContinue "$working_dir/mockapp"
         Remove-Item -Force -ErrorAction SilentlyContinue "$working_dir/moch-shim.ps1"