Skip to content

Commit b8c2253

Browse files
authored
fix!: Typo in field names in the PullStats struct (#3445)
BREAKING CHANGE: `MergablePulls`=>`MergeablePulls`, `UnmergablePulls`=>`UnmergeablePulls`
1 parent c44e9dd commit b8c2253

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

github/admin_stats.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ func (s GistStats) String() string {
118118
return Stringify(s)
119119
}
120120

121-
// PullStats represents the number of total, merged, mergable and unmergeable
121+
// PullStats represents the number of total, merged, mergeable and unmergeable
122122
// pull-requests.
123123
type PullStats struct {
124-
TotalPulls *int `json:"total_pulls,omitempty"`
125-
MergedPulls *int `json:"merged_pulls,omitempty"`
126-
MergablePulls *int `json:"mergeable_pulls,omitempty"`
127-
UnmergablePulls *int `json:"unmergeable_pulls,omitempty"`
124+
TotalPulls *int `json:"total_pulls,omitempty"`
125+
MergedPulls *int `json:"merged_pulls,omitempty"`
126+
MergeablePulls *int `json:"mergeable_pulls,omitempty"`
127+
UnmergeablePulls *int `json:"unmergeable_pulls,omitempty"`
128128
}
129129

130130
func (s PullStats) String() string {

github/admin_stats_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestAdminService_GetAdminStats(t *testing.T) {
9898

9999
func TestAdminService_Stringify(t *testing.T) {
100100
t.Parallel()
101-
want := "github.AdminStats{Issues:github.IssueStats{TotalIssues:179, OpenIssues:83, ClosedIssues:96}, Hooks:github.HookStats{TotalHooks:27, ActiveHooks:23, InactiveHooks:4}, Milestones:github.MilestoneStats{TotalMilestones:7, OpenMilestones:6, ClosedMilestones:1}, Orgs:github.OrgStats{TotalOrgs:33, DisabledOrgs:0, TotalTeams:60, TotalTeamMembers:314}, Comments:github.CommentStats{TotalCommitComments:6, TotalGistComments:28, TotalIssueComments:366, TotalPullRequestComments:30}, Pages:github.PageStats{TotalPages:36}, Users:github.UserStats{TotalUsers:254, AdminUsers:45, SuspendedUsers:21}, Gists:github.GistStats{TotalGists:178, PrivateGists:151, PublicGists:25}, Pulls:github.PullStats{TotalPulls:86, MergedPulls:60, MergablePulls:21, UnmergablePulls:3}, Repos:github.RepoStats{TotalRepos:212, RootRepos:194, ForkRepos:18, OrgRepos:51, TotalPushes:3082, TotalWikis:15}}"
101+
want := "github.AdminStats{Issues:github.IssueStats{TotalIssues:179, OpenIssues:83, ClosedIssues:96}, Hooks:github.HookStats{TotalHooks:27, ActiveHooks:23, InactiveHooks:4}, Milestones:github.MilestoneStats{TotalMilestones:7, OpenMilestones:6, ClosedMilestones:1}, Orgs:github.OrgStats{TotalOrgs:33, DisabledOrgs:0, TotalTeams:60, TotalTeamMembers:314}, Comments:github.CommentStats{TotalCommitComments:6, TotalGistComments:28, TotalIssueComments:366, TotalPullRequestComments:30}, Pages:github.PageStats{TotalPages:36}, Users:github.UserStats{TotalUsers:254, AdminUsers:45, SuspendedUsers:21}, Gists:github.GistStats{TotalGists:178, PrivateGists:151, PublicGists:25}, Pulls:github.PullStats{TotalPulls:86, MergedPulls:60, MergeablePulls:21, UnmergeablePulls:3}, Repos:github.RepoStats{TotalRepos:212, RootRepos:194, ForkRepos:18, OrgRepos:51, TotalPushes:3082, TotalWikis:15}}"
102102
if got := testAdminStats.String(); got != want {
103103
t.Errorf("testAdminStats.String = %q, want %q", got, want)
104104
}
@@ -143,7 +143,7 @@ func TestAdminService_Stringify(t *testing.T) {
143143
t.Errorf("testAdminStats.Gists.String = %q, want %q", got, want)
144144
}
145145

146-
want = "github.PullStats{TotalPulls:86, MergedPulls:60, MergablePulls:21, UnmergablePulls:3}"
146+
want = "github.PullStats{TotalPulls:86, MergedPulls:60, MergeablePulls:21, UnmergeablePulls:3}"
147147
if got := testAdminStats.Pulls.String(); got != want {
148148
t.Errorf("testAdminStats.Pulls.String = %q, want %q", got, want)
149149
}
@@ -183,10 +183,10 @@ var testAdminStats = &AdminStats{
183183
SuspendedUsers: Ptr(21),
184184
},
185185
Pulls: &PullStats{
186-
TotalPulls: Ptr(86),
187-
MergedPulls: Ptr(60),
188-
MergablePulls: Ptr(21),
189-
UnmergablePulls: Ptr(3),
186+
TotalPulls: Ptr(86),
187+
MergedPulls: Ptr(60),
188+
MergeablePulls: Ptr(21),
189+
UnmergeablePulls: Ptr(3),
190190
},
191191
Issues: &IssueStats{
192192
TotalIssues: Ptr(179),
@@ -368,10 +368,10 @@ func TestPullStats_Marshal(t *testing.T) {
368368
testJSONMarshal(t, &PullStats{}, "{}")
369369

370370
u := &PullStats{
371-
TotalPulls: Ptr(1),
372-
MergedPulls: Ptr(1),
373-
MergablePulls: Ptr(1),
374-
UnmergablePulls: Ptr(1),
371+
TotalPulls: Ptr(1),
372+
MergedPulls: Ptr(1),
373+
MergeablePulls: Ptr(1),
374+
UnmergeablePulls: Ptr(1),
375375
}
376376

377377
want := `{
@@ -442,10 +442,10 @@ func TestAdminStats_Marshal(t *testing.T) {
442442
SuspendedUsers: Ptr(21),
443443
},
444444
Pulls: &PullStats{
445-
TotalPulls: Ptr(86),
446-
MergedPulls: Ptr(60),
447-
MergablePulls: Ptr(21),
448-
UnmergablePulls: Ptr(3),
445+
TotalPulls: Ptr(86),
446+
MergedPulls: Ptr(60),
447+
MergeablePulls: Ptr(21),
448+
UnmergeablePulls: Ptr(3),
449449
},
450450
Issues: &IssueStats{
451451
TotalIssues: Ptr(179),

github/github-accessors.go

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

github/github-accessors_test.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

github/github-stringify_test.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)