fix merge stuff

cisagov · Dec 10, 2024 · 6ac1b4e · 6ac1b4e
1 parent 057e59e
commit 6ac1b4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/.github/workflows/unit_test_workflows.yaml b/.github/workflows/unit_test_workflows.yaml
@@ -19,20 +19,7 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - run: Invoke-Pester -Output 'Detailed' -Path 'Testing/workflow/Invoke-PSSA.Tests.ps1'
-  prbody:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: powershell
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      # - name: Run Pester Tests
-      #   run: |
-      #     # This should run all workflow unit tests
-      #     Invoke-Pester -Output 'Detailed' -Path 'Testing/workflow'
-      - name: Run Invoke PSSA Pester Tests
+      - name: Run Pester Tests
         run: |
           # Source the function
           . utils/workflow/Invoke-PesterTests.ps1

diff --git a/utils/workflow/Initialize-ScubaGearForTesting.ps1 b/utils/workflow/Initialize-ScubaGearForTesting.ps1
@@ -11,4 +11,5 @@ function Initialize-ScubaGearForTesting {
   Write-Output 'Importing function Initialize-Scuba...'
   Import-Module (Join-Path -Path $RepoRootPath -ChildPath 'PowerShell/ScubaGear') -Function Initialize-Scuba
   Write-Output 'Calling Initialize ScubaGear...'
-  Initialize-SCuBA
+  Initialize-SCuBA
+}