Skip to content

refactor: Simplify error handling in JSON decoding in tests #3602

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 1 commit into from
Jun 25, 2025
Merged

refactor: Simplify error handling in JSON decoding in tests #3602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions github/enterprise_actions_runners_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ func TestEnterpriseService_GenerateEnterpriseJITConfig(t *testing.T) {

mux.HandleFunc("/enterprises/o/actions/runners/generate-jitconfig", func(w http.ResponseWriter, r *http.Request) {
v := new(GenerateJITConfigRequest)
err := json.NewDecoder(r.Body).Decode(v)
if err != nil {
t.Errorf("Request body decode failed: %v", err)
}
assertNilError(t, json.NewDecoder(r.Body).Decode(v))

testMethod(t, r, "POST")
if !cmp.Equal(v, input) {
Expand Down
15 changes: 3 additions & 12 deletions github/orgs_codesecurity_configurations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,7 @@ func TestOrganizationsService_CreateCodeSecurityConfiguration(t *testing.T) {

mux.HandleFunc("/orgs/o/code-security/configurations", func(w http.ResponseWriter, r *http.Request) {
v := new(CodeSecurityConfiguration)
err := json.NewDecoder(r.Body).Decode(v)
if err != nil {
t.Errorf("Organizations.CreateCodeSecurityConfiguration request body decode failed: %v", err)
}
assertNilError(t, json.NewDecoder(r.Body).Decode(v))

if !reflect.DeepEqual(v, input) {
t.Errorf("Organizations.CreateCodeSecurityConfiguration request body = %+v, want %+v", v, input)
Expand Down Expand Up @@ -244,10 +241,7 @@ func TestOrganizationsService_UpdateCodeSecurityConfiguration(t *testing.T) {

mux.HandleFunc("/orgs/o/code-security/configurations/1", func(w http.ResponseWriter, r *http.Request) {
v := new(CodeSecurityConfiguration)
err := json.NewDecoder(r.Body).Decode(v)
if err != nil {
t.Errorf("Organizations.UpdateCodeSecurityConfiguration request body decode failed: %v", err)
}
assertNilError(t, json.NewDecoder(r.Body).Decode(v))

if !reflect.DeepEqual(v, input) {
t.Errorf("Organizations.UpdateCodeSecurityConfiguration request body = %+v, want %+v", v, input)
Expand Down Expand Up @@ -329,10 +323,7 @@ func TestOrganizationsService_AttachCodeSecurityConfigurationsToRepositories(t *
SelectedRepositoryIDs []int64 `json:"selected_repository_ids,omitempty"`
}
v := new(request)
err := json.NewDecoder(r.Body).Decode(v)
if err != nil {
t.Errorf("Organizations.AttachCodeSecurityConfigurationsToRepositories request body decode failed: %v", err)
}
assertNilError(t, json.NewDecoder(r.Body).Decode(v))
if v.Scope != "selected" {
t.Errorf("Organizations.AttachCodeSecurityConfigurationsToRepositories request body scope = %s, want selected", v.Scope)
}
Expand Down
Loading