Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix functional testing and cached output errors #1334

Merged
merged 3 commits into from
Sep 27, 2024
Merged

Fix functional testing and cached output errors #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85b17bf
Fix incorrect filename reference in LoadProviderExport
schrolla Sep 24, 2024
f2bc080
* Fix CsvParams ProductNames to use ScubaConfig
schrolla Sep 25, 2024
c8fafff
Fix MS.SHAREPOINT.2.1v1 precondition ordering issue
schrolla Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions PowerShell/ScubaGear/Modules/Orchestrator.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ function Invoke-SCuBA {
}
# Craft the csv version of just the results
$CsvParams = @{
'ProductNames' = $ProductNames;
'ProductNames' = $ScubaConfig.ProductNames;
'OutFolderPath' = $OutFolderPath;
'OutJsonFileName' = $ScubaConfig.OutJsonFileName;
'OutCsvFileName' = $ScubaConfig.OutCsvFileName;
Expand Down Expand Up @@ -1745,7 +1745,7 @@ function Invoke-SCuBACached {
# Uses the custom UTF8 NoBOM function to reoutput the Provider JSON file
$ProviderContent = $SettingsExport | ConvertTo-Json -Depth 20
$ActualSavedLocation = Set-Utf8NoBom -Content $ProviderContent `
-Location $ProviderJSONFilePath -FileName "$OutProviderFileName.json"
-Location $OutPath -FileName "$OutProviderFileName.json"
Write-Debug $ActualSavedLocation
}
$SettingsExport = Get-Content $ProviderJSONFilePath | ConvertFrom-Json
Expand Down
2 changes: 1 addition & 1 deletion Testing/Functional/Products/FunctionalTestUtils.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function LoadProviderExport() {
Copy-Item -Path "$OutputFolder/ProviderSettingsExport.json" -Destination "$OutputFolder/ModifiedProviderSettingsExport.json"
}

$Content = Get-Utf8NoBom -FilePath "$OutputFolder/ProviderSettingsExport.json"
$Content = Get-Utf8NoBom -FilePath "$OutputFolder/ModifiedProviderSettingsExport.json"
$ProviderExport = $Content | ConvertFrom-Json
$ProviderExport
}
Expand Down
4 changes: 4 additions & 0 deletions Testing/Functional/Products/TestPlans/sharepoint.pnp.testplan.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ TestPlan:
- Command: Set-PnPTenant
Splat:
SharingCapability: ExternalUserAndGuestSharing
- Command: Set-PnPTenant
Splat:
DefaultSharingLinkType: AnonymousAccess
Postconditions: []
ExpectedResult: false
Expand All @@ -131,6 +133,8 @@ TestPlan:
- Command: Set-PnPTenant
Splat:
SharingCapability: Disabled
- Command: Set-PnPTenant
Splat:
DefaultSharingLinkType: Direct
Postconditions: []
ExpectedResult: true
Expand Down
Loading