Fix integ test

Author: johlju

source/Private/Invoke-ReportServerSetupAction.ps1

@@ -147,7 +147,7 @@ function Invoke-ReportServerSetupAction
 
         [Parameter(ParameterSetName = 'Install')]
         [Parameter(ParameterSetName = 'Repair')]
-        [ValidateSet('Development', 'Evaluation', 'ExpressAdvanced')]
+        [ValidateSet('Developer', 'Evaluation', 'ExpressAdvanced')]
         [System.String]
         $Edition,
 
@@ -213,6 +213,9 @@ function Invoke-ReportServerSetupAction
 
     Assert-BoundParameter @assertBoundParameters
 
+    # Sensitive values.
+    $sensitiveValue = @()
+
     # Default action is install or upgrade.
     $setupArgument = '/quiet /IAcceptLicenseTerms'
 
@@ -228,6 +231,10 @@ function Invoke-ReportServerSetupAction
     if ($ProductKey)
     {
         $setupArgument += ' /PID={0}' -f $ProductKey
+
+        $sensitiveValue += @(
+            $ProductKey
+        )
     }
 
     if ($EditionUpgrade.IsPresent)
@@ -263,11 +270,6 @@ function Invoke-ReportServerSetupAction
 
     $verboseSetupArgument = $setupArgument
 
-    # Sensitive values.
-    $sensitiveValue = @(
-        $ProductKey
-    )
-
     # Obfuscate sensitive values.
     foreach ($currentSensitiveValue in $sensitiveValue)
     {

source/Public/Install-SqlDscBIReportServer.ps1

@@ -96,7 +96,7 @@ function Install-SqlDscBIReportServer
         $EditionUpgrade,
 
         [Parameter()]
-        [ValidateSet('Development', 'Evaluation', 'ExpressAdvanced')]
+        [ValidateSet('Developer', 'Evaluation', 'ExpressAdvanced')]
         [System.String]
         $Edition,
 

source/Public/Install-SqlDscReportingService.ps1

@@ -98,7 +98,7 @@ function Install-SqlDscReportingService
         $EditionUpgrade,
 
         [Parameter()]
-        [ValidateSet('Development', 'Evaluation', 'ExpressAdvanced')]
+        [ValidateSet('Developer', 'Evaluation', 'ExpressAdvanced')]
         [System.String]
         $Edition,
 

source/Public/Repair-SqlDscBIReportServer.ps1

@@ -92,7 +92,7 @@ function Repair-SqlDscBIReportServer
         $EditionUpgrade,
 
         [Parameter()]
-        [ValidateSet('Development', 'Evaluation', 'ExpressAdvanced')]
+        [ValidateSet('Developer', 'Evaluation', 'ExpressAdvanced')]
         [System.String]
         $Edition,
 

source/Public/Repair-SqlDscReportingService.ps1

@@ -94,7 +94,7 @@ function Repair-SqlDscReportingService
         $EditionUpgrade,
 
         [Parameter()]
-        [ValidateSet('Development', 'Evaluation', 'ExpressAdvanced')]
+        [ValidateSet('Developer', 'Evaluation', 'ExpressAdvanced')]
         [System.String]
         $Edition,
 

tests/Integration/Commands/Install-SqlDscBIReportServer.Integration.Tests.ps1

@@ -47,21 +47,21 @@ Describe 'Install-SqlDscBIReportServer' -Tag @('Integration_SQL2016', 'Integrati
                     Force                = $true
                 }
 
-                Install-SqlDscBIReportServer @installSqlDscBIReportServerParameters
+                Install-SqlDscBIReportServer @installSqlDscBIReportServerParameters -ErrorAction 'Stop'
             } | Should -Not -Throw
         }
 
         It 'Should have installed Power BI Report Server' {
             # Validate the Power BI Report Server installation
-            $reportServerService = Get-Service -Name 'PBIReportServer'
+            $reportServerService = Get-Service -Name 'PowerBIReportServer'
 
             $reportServerService | Should -Not -BeNullOrEmpty
             $reportServerService.Status | Should -Be 'Running'
         }
 
         It 'Should stop the Power BI Report Server service' {
             # Stop the Power BI Report Server service to save memory on the build worker
-            $stopServiceResult = Stop-Service -Name 'PBIReportServer' -Force -PassThru -Verbose -ErrorAction 'Stop'
+            $stopServiceResult = Stop-Service -Name 'PowerBIReportServer' -Force -PassThru -Verbose -ErrorAction 'Stop'
 
             write-verbose -Message ($stopServiceResult | Out-String) -Verbose
 

tests/Integration/Commands/Install-SqlDscReportingService.Integration.Tests.ps1

@@ -47,7 +47,7 @@ Describe 'Install-SqlDscReportingService' -Tag @('Integration_SQL2022') {
                     Force                = $true
                 }
 
-                Install-SqlDscReportingService @installSqlDscReportingServicesParameters
+                Install-SqlDscReportingService @installSqlDscReportingServicesParameters -ErrorAction 'Stop'
             } | Should -Not -Throw
         }