Skip to content

Fix multi-result behavior across all versions of PowerShell (fixes CI UT's on all platforms) #199

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

Merged
merged 5 commits into from
May 30, 2020
Merged

Fix multi-result behavior across all versions of PowerShell (fixes CI UT's on all platforms) #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
114e6f3
Temporarily disable Linux in CI until unexpected UT failures are reso…
HowardWolosky May 29, 2020
55fabef
Fixes
HowardWolosky May 29, 2020
453ff19
Everything passing
HowardWolosky May 30, 2020
23a680a
Re-enable tests for Linux
HowardWolosky May 30, 2020
3066540
Restore GitHubAnalytics functions to previous (correct) array behavior
HowardWolosky May 30, 2020
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
9 changes: 6 additions & 3 deletions GitHubCore.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,11 @@ function Invoke-GHRestMethodMultipleResult
}

$result = Invoke-GHRestMethod @params
$finalResult += $result.result
if ($null -ne $result.result)
{
$finalResult += $result.result
}

$nextLink = $result.nextLink
$currentDescription = "$Description (getting additional results)"
}
Expand All @@ -681,8 +685,7 @@ function Invoke-GHRestMethodMultipleResult
Set-TelemetryEvent -EventName $TelemetryEventName -Properties $TelemetryProperties -Metrics $telemetryMetrics
}

# Ensure we're always returning our results as an array, even if there is a single result.
return @($finalResult)
return $finalResult
}
catch
{
Expand Down
58 changes: 28 additions & 30 deletions Tests/GitHubAnalytics.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ try
$repo = New-GitHubRepository -RepositoryName ([Guid]::NewGuid().Guid) -AutoInit

Context 'When initially created, there are no issues' {
$issues = Get-GitHubIssue -Uri $repo.svn_url
$issues = @(Get-GitHubIssue -Uri $repo.svn_url)

It 'Should return expected number of issues' {
@($issues).Count | Should be 0
$issues.Count | Should be 0
}
}

Expand All @@ -34,29 +34,29 @@ try
$newIssues[0] = Update-GitHubIssue -OwnerName $script:ownerName -RepositoryName $repo.name -Issue $newIssues[0].number -State Closed
$newIssues[-1] = Update-GitHubIssue -OwnerName $script:ownerName -RepositoryName $repo.name -Issue $newIssues[-1].number -State Closed

$issues = Get-GitHubIssue -Uri $repo.svn_url
$issues = @(Get-GitHubIssue -Uri $repo.svn_url)
It 'Should return only open issues' {
@($issues).Count | Should be 2
$issues.Count | Should be 2
}

$issues = Get-GitHubIssue -Uri $repo.svn_url -State All
$issues = @(Get-GitHubIssue -Uri $repo.svn_url -State All)
It 'Should return all issues' {
@($issues).Count | Should be 4
$issues.Count | Should be 4
}

$createdOnOrAfterDate = Get-Date -Date $newIssues[0].created_at
$createdOnOrBeforeDate = Get-Date -Date $newIssues[2].created_at
$issues = (Get-GitHubIssue -Uri $repo.svn_url) | Where-Object { ($_.created_at -ge $createdOnOrAfterDate) -and ($_.created_at -le $createdOnOrBeforeDate) }
$issues = @((Get-GitHubIssue -Uri $repo.svn_url) | Where-Object { ($_.created_at -ge $createdOnOrAfterDate) -and ($_.created_at -le $createdOnOrBeforeDate) })

It 'Smart object date conversion works for comparing dates' {
@($issues).Count | Should be 2
$issues.Count | Should be 2
}

$createdDate = Get-Date -Date $newIssues[1].created_at
$issues = Get-GitHubIssue -Uri $repo.svn_url -State All | Where-Object { ($_.created_at -ge $createdDate) -and ($_.state -eq 'closed') }
$issues = @(Get-GitHubIssue -Uri $repo.svn_url -State All | Where-Object { ($_.created_at -ge $createdDate) -and ($_.state -eq 'closed') })

It 'Able to filter based on date and state' {
@($issues).Count | Should be 1
$issues.Count | Should be 1
}
}

Expand Down Expand Up @@ -88,18 +88,18 @@ try
$issueCounts = $issueCounts | Sort-Object -Property Count -Descending

It 'Should return expected number of issues for each repository' {
@($issueCounts[0].Count) | Should be 3
@($issueCounts[1].Count) | Should be 0
$issueCounts[0].Count | Should be 3
$issueCounts[1].Count | Should be 0
}

It 'Should return expected repository names' {
@($issueCounts[0].Uri) | Should be ($repo1.svn_url)
@($issueCounts[1].Uri) | Should be ($repo2.svn_url)
$issueCounts[0].Uri | Should be $repo1.svn_url
$issueCounts[1].Uri | Should be $repo2.svn_url
}
}

$null = Remove-GitHubRepository -Uri ($repo1.svn_url)
$null = Remove-GitHubRepository -Uri ($repo2.svn_url)
$null = Remove-GitHubRepository -Uri $repo1.svn_url
$null = Remove-GitHubRepository -Uri $repo2.svn_url
}


Expand Down Expand Up @@ -186,10 +186,10 @@ try
$null = New-GitHubRepository -RepositoryName $repositoryName -AutoInit
$repositoryUrl = "https://github.com/$script:ownerName/$repositoryName"

$collaborators = Get-GitHubRepositoryCollaborator -Uri $repositoryUrl
$collaborators = @(Get-GitHubRepositoryCollaborator -Uri $repositoryUrl)

It 'Should return expected number of collaborators' {
@($collaborators).Count | Should be 1
$collaborators.Count | Should be 1
}

$null = Remove-GitHubRepository -OwnerName $script:ownerName -RepositoryName $repositoryName
Expand All @@ -201,10 +201,10 @@ try
$null = New-GitHubRepository -RepositoryName $repositoryName -AutoInit
$repositoryUrl = "https://github.com/$script:ownerName/$repositoryName"

$contributors = Get-GitHubRepositoryContributor -Uri $repositoryUrl -IncludeStatistics
$contributors = @(Get-GitHubRepositoryContributor -Uri $repositoryUrl -IncludeStatistics)

It 'Should return expected number of contributors' {
@($contributors).Count | Should be 1
$contributors.Count | Should be 1
}

$null = Remove-GitHubRepository -OwnerName $script:ownerName -RepositoryName $repositoryName
Expand Down Expand Up @@ -242,15 +242,13 @@ try
}

Describe 'Getting repositories from organization' {
<# Temporary hack due to issues with this test in ADO #> . (Join-Path -Path $moduleRootPath -ChildPath 'Tests\Config\Settings.ps1')

$original = Get-GitHubRepository -OrganizationName $script:organizationName
$original = @(Get-GitHubRepository -OrganizationName $script:organizationName)

$repo = New-GitHubRepository -RepositoryName ([guid]::NewGuid().Guid) -OrganizationName $script:organizationName
$current = Get-GitHubRepository -OrganizationName $script:organizationName
$current = @(Get-GitHubRepository -OrganizationName $script:organizationName)

It 'Should return expected number of organization repositories' {
(@($current).Count - @($original).Count) | Should be 1
($current.Count - $original.Count) | Should be 1
}

$null = Remove-GitHubRepository -Uri $repo.svn_url
Expand All @@ -260,15 +258,15 @@ try
$repositoryName = [guid]::NewGuid().Guid
$null = New-GitHubRepository -RepositoryName $repositoryName -AutoInit

$contributors = Get-GitHubRepositoryContributor -OwnerName $script:ownerName -RepositoryName $repositoryName -IncludeStatistics
$contributors = @(Get-GitHubRepositoryContributor -OwnerName $script:ownerName -RepositoryName $repositoryName -IncludeStatistics)

$uniqueContributors = $contributors |
Select-Object -ExpandProperty author |
Select-Object -ExpandProperty login -Unique
Sort-Object

It 'Should return expected number of unique contributors' {
@($uniqueContributors).Count | Should be 1
$uniqueContributors.Count | Should be 1
}

$null = Remove-GitHubRepository -OwnerName $script:ownerName -RepositoryName $repositoryName
Expand Down Expand Up @@ -298,14 +296,14 @@ try
$repositoryName = [guid]::NewGuid().Guid
$null = New-GitHubRepository -RepositoryName $repositoryName -AutoInit

$branches = Get-GitHubRepositoryBranch -OwnerName $script:ownerName -RepositoryName $repositoryName
$branches = @(Get-GitHubRepositoryBranch -OwnerName $script:ownerName -RepositoryName $repositoryName)

It 'Should return expected number of repository branches' {
@($branches).Count | Should be 1
$branches.Count | Should be 1
}

It 'Should return the name of the branches' {
@($branches[0].name) | Should be "master"
$branches[0].name | Should be 'master'
}

$null = Remove-GitHubRepository -OwnerName $script:ownerName -RepositoryName $repositoryName
Expand Down
2 changes: 1 addition & 1 deletion Tests/GitHubAssignees.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ try
Context 'For adding an assignee to an issue'{
$assigneeList = @(Get-GitHubAssignee -Uri $repo.svn_url)
$assigneeUserName = $assigneeList[0].login
$assignees = @($assigneeUserName)
$assignees = $assigneeUserName
New-GithubAssignee -Uri $repo.svn_url -Issue $issue.number -Assignee $assignees
$issue = Get-GitHubIssue -Uri $repo.svn_url -Issue $issue.number

Expand Down
24 changes: 12 additions & 12 deletions Tests/GitHubLabels.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ try
Set-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Label $defaultLabels

Context 'When querying for all labels' {
$labels = Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName
$labels = @(Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName)

It 'Should return expected number of labels' {
$($labels).Count | Should be $:defaultLabels.Count
$labels.Count | Should be $:defaultLabels.Count
}
}

Expand Down Expand Up @@ -123,17 +123,17 @@ try

$labelName = [Guid]::NewGuid().Guid
New-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Name $labelName -Color BBBBBB
$labels = Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName
$labels = @(Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName)

It 'Should return increased number of labels' {
$($labels).Count | Should be ($defaultLabels.Count + 1)
$labels.Count | Should be ($defaultLabels.Count + 1)
}

Remove-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Name $labelName
$labels = Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName
$labels = @(Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName)

It 'Should return expected number of labels' {
$($labels).Count | Should be $defaultLabels.Count
$labels.Count | Should be $defaultLabels.Count
}

$null = Remove-GitHubRepository -OwnerName $ownerName -RepositoryName $repositoryName
Expand Down Expand Up @@ -187,7 +187,7 @@ try

# Add new label
New-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Name $labelName -Color BBBBBB
$labels = Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName
$labels = @(Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName)

# Change color of existing label
Update-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Name "bug" -NewName "bug" -Color BBBBBB
Expand All @@ -200,10 +200,10 @@ try
}

Set-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Label $defaultLabels
$labels = Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName
$labels = @(Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName)

It 'Should return expected number of labels' {
$($labels).Count | Should be $defaultLabels.Count
$labels.Count | Should be $defaultLabels.Count
$bugLabel = $labels | Where-Object {$_.name -eq "bug"}
$bugLabel.color | Should be "fc2929"
}
Expand Down Expand Up @@ -269,7 +269,7 @@ try
Remove-GitHubIssueLabel -OwnerName $ownerName -RepositoryName $repositoryName -Name "discussion" -Issue $issue.number
Remove-GitHubIssueLabel -OwnerName $ownerName -RepositoryName $repositoryName -Name "question" -Issue $issue.number
Remove-GitHubIssueLabel -OwnerName $ownerName -RepositoryName $repositoryName -Name "bug" -Issue $issue.number
$labelIssues = Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Issue $issue.number
$labelIssues = @(Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Issue $issue.number)

It 'Should have removed three labels from the issue' {
$labelIssues.Count | Should be ($defaultLabels.Count - 3)
Expand All @@ -278,7 +278,7 @@ try

Context 'For removing all issues'{
Remove-GitHubIssueLabel -OwnerName $ownerName -RepositoryName $repositoryName -Issue $issue.number
$labelIssues = Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Issue $issue.number
$labelIssues = @(Get-GitHubLabel -OwnerName $ownerName -RepositoryName $repositoryName -Issue $issue.number)

It 'Should have removed all labels from the issue' {
$labelIssues.Count | Should be 0
Expand Down Expand Up @@ -312,7 +312,7 @@ try
$labelIssues.Count | Should be $defaultLabels.Count
}

$updatedIssueLabels = @($labelsToAdd[0])
$updatedIssueLabels = $labelsToAdd[0]
$updatedIssue = Update-GitHubIssue -OwnerName $ownerName -RepositoryName $repositoryName -Issue $issue.number -Label $updatedIssueLabels

It 'Should have 1 label after updating the issue' {
Expand Down
6 changes: 3 additions & 3 deletions Tests/GitHubMilestones.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ try
}

Context 'For getting milestones from a repo' {
$existingMilestones = @(Get-GitHubMilestone -Uri $repo.svn_url -State Closed)
$existingMilestones =@(Get-GitHubMilestone -Uri $repo.svn_url -State Closed)
$issue = Get-GitHubIssue -Uri $repo.svn_url -Issue $issue.number

It 'Should have the expected number of milestones' {
Expand Down Expand Up @@ -110,11 +110,11 @@ try
$existingMilestones.Count | Should be 4
}

foreach($milestone in $existingMilestones) {
foreach ($milestone in $existingMilestones) {
Remove-GitHubMilestone -Uri $repo.svn_url -Milestone $milestone.number
}

$existingMilestones = @(Get-GitHubMilestone -Uri $repo.svn_url)
$existingMilestones = @(Get-GitHubMilestone -Uri $repo.svn_url -State All)
$issue = Get-GitHubIssue -Uri $repo.svn_url -Issue $issue.number

It 'Should have no milestones' {
Expand Down
Loading