added some unit tests and removed check for unicode ampersand character

cisagov · Nov 12, 2024 · be01712 · be01712
1 parent 477f2b7
commit be01712
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/PowerShell/ScubaGear/Modules/Orchestrator.psm1 b/PowerShell/ScubaGear/Modules/Orchestrator.psm1
@@ -849,7 +849,7 @@ function Format-PlainText {
         $CleanString = $CleanString -replace '(.*)(<a href=")([\w#./=&?%\-+:;$@,]+)(".*>)(.*)(</a>)(.*)', '$1$5, $3$7'
         $CleanString = $CleanString.Replace("<", "&lt;")
         $CleanString = $CleanString.Replace(">", "&gt;")
-        $CleanString = $CleanString.Replace("&", "&amp;")
+        #$CleanString = $CleanString.Replace("&", "&amp;")
         $CleanString
     }
 }
@@ -1064,7 +1064,6 @@ function Merge-JsonOutput {
             # Convert the output a json string
             $MetaData = ConvertTo-Json $MetaData -Depth 3
             $Results = ConvertTo-Json $Results -Depth 5
-           # Loop through each property
             $Summary = ConvertTo-Json $Summary -Depth 3
             $ReportJson = @"
 {
@@ -1080,7 +1079,7 @@ function Merge-JsonOutput {
             $ReportJson = $ReportJson.replace("\u003c", "<")
             $ReportJson = $ReportJson.replace("\u003e", ">")
             $ReportJson = $ReportJson.replace("\u0027", "'")
-            $ReportJson = $ReportJson.replace("\u0026", "&")
+            $ReportJson = $ReportJson.replace("$amp;", "&")
 
             # Save the file
             $JsonFileName = Join-Path -Path $OutFolderPath "$($OutJsonFileName).json" -ErrorAction 'Stop'

diff --git a/PowerShell/ScubaGear/Testing/Unit/PowerShell/Orchestrator/Format-PlainText.Tests.ps1 b/PowerShell/ScubaGear/Testing/Unit/PowerShell/Orchestrator/Format-PlainText.Tests.ps1
@@ -34,15 +34,15 @@ InModuleScope Orchestrator {
             }
             It 'Reformats links with special symbols' {
                 $Output = Format-PlainText 'See <a href="https://example.com#anchor?p1=v1&p2=v2" target="_blank">this example</a> for more details.'
-                $Output | Should -Be "See this example, https://example.com#anchor?p1=v1&amp;p2=v2 for more details."
+                $Output | Should -Be "See this example, https://example.com#anchor?p1=v1&p2=v2 for more details."
             }
             It 'Reformats links without target' {
                 $Output = Format-PlainText 'See <a href="example.com">this example</a> for more details.'
                 $Output | Should -Be "See this example, example.com for more details."
             }
             It 'Reformats links when there is no trailing content' {
                 $Output = Format-PlainText 'See <a href="https://example.com#anchor?p1=v1&p2=v2" target="_blank">this example</a>.'
-                $Output | Should -Be "See this example, https://example.com#anchor?p1=v1&amp;p2=v2."
+                $Output | Should -Be "See this example, https://example.com#anchor?p1=v1&p2=v2."
             }
         }
     }