+
Skip to content

Fix breakages caused by merge #3781

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
Oct 14, 2025
+20 −25
Merged

Fix breakages caused by merge #3781

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
32 changes: 16 additions & 16 deletions github/projects_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestProjectsService_ListProjectsForOrg(t *testing.T) {
})

opts := &ListProjectsOptions{Query: "alpha", ListProjectsPaginationOptions: ListProjectsPaginationOptions{After: "2", Before: "1"}}
ctx := context.Background()
ctx := t.Context()
projects, _, err := client.Projects.ListProjectsForOrg(ctx, "o", opts)
if err != nil {
t.Fatalf("Projects.ListProjectsForOrg returned error: %v", err)
Expand All @@ -54,7 +54,7 @@ func TestProjectsService_ListProjectsForOrg(t *testing.T) {
})

// still allow both set (no validation enforced) – ensure it does not error
ctxBypass := context.WithValue(context.Background(), BypassRateLimitCheck, true)
ctxBypass := context.WithValue(t.Context(), BypassRateLimitCheck, true)
if _, _, err = client.Projects.ListProjectsForOrg(ctxBypass, "o", &ListProjectsOptions{ListProjectsPaginationOptions: ListProjectsPaginationOptions{Before: "b", After: "a"}}); err != nil {
t.Fatalf("unexpected error when both before/after set: %v", err)
}
Expand All @@ -69,7 +69,7 @@ func TestProjectsService_GetProjectForOrg(t *testing.T) {
fmt.Fprint(w, `{"id":1,"title":"OrgProj","created_at":"2011-01-02T15:04:05Z","updated_at":"2012-01-02T15:04:05Z"}`)
})

ctx := context.Background()
ctx := t.Context()
project, _, err := client.Projects.GetProjectForOrg(ctx, "o", 1)
if err != nil {
t.Fatalf("Projects.GetProjectForOrg returned error: %v", err)
Expand Down Expand Up @@ -105,7 +105,7 @@ func TestProjectsService_ListUserProjects(t *testing.T) {
})

opts := &ListProjectsOptions{Query: "beta", ListProjectsPaginationOptions: ListProjectsPaginationOptions{Before: "1", After: "2", PerPage: 2}}
ctx := context.Background()
ctx := t.Context()
var ctxBypass context.Context
projects, _, err := client.Projects.ListProjectsForUser(ctx, "u", opts)
if err != nil {
Expand All @@ -130,7 +130,7 @@ func TestProjectsService_ListUserProjects(t *testing.T) {
})

// still allow both set (no validation enforced) – ensure it does not error
ctxBypass = context.WithValue(context.Background(), BypassRateLimitCheck, true)
ctxBypass = context.WithValue(t.Context(), BypassRateLimitCheck, true)
if _, _, err = client.Projects.ListProjectsForUser(ctxBypass, "u", &ListProjectsOptions{ListProjectsPaginationOptions: ListProjectsPaginationOptions{Before: "b", After: "a"}}); err != nil {
t.Fatalf("unexpected error when both before/after set: %v", err)
}
Expand All @@ -145,7 +145,7 @@ func TestProjectsService_GetProjectForUser(t *testing.T) {
fmt.Fprint(w, `{"id":2,"title":"UProj","created_at":"2011-01-02T15:04:05Z","updated_at":"2012-01-02T15:04:05Z"}`)
})

ctx := context.Background()
ctx := t.Context()
project, _, err := client.Projects.GetProjectForUser(ctx, "u", 2)
if err != nil {
t.Fatalf("Projects.GetProjectForUser returned error: %v", err)
Expand Down Expand Up @@ -189,7 +189,7 @@ func TestProjectsService_ListProjectsForOrg_pagination(t *testing.T) {
http.Error(w, "unexpected query", http.StatusBadRequest)
})

ctx := context.Background()
ctx := t.Context()
first, resp, err := client.Projects.ListProjectsForOrg(ctx, "o", nil)
if err != nil {
t.Fatalf("first page error: %v", err)
Expand Down Expand Up @@ -236,7 +236,7 @@ func TestProjectsService_ListProjectsForUser_pagination(t *testing.T) {
http.Error(w, "unexpected query", http.StatusBadRequest)
})

ctx := context.Background()
ctx := t.Context()
first, resp, err := client.Projects.ListProjectsForUser(ctx, "u", nil)
if err != nil {
t.Fatalf("first page error: %v", err)
Expand Down Expand Up @@ -309,22 +309,22 @@ func TestProjectsService_ListProjectFieldsForOrg(t *testing.T) {
})

opts := &ListProjectsOptions{Query: "text", ListProjectsPaginationOptions: ListProjectsPaginationOptions{After: "2", Before: "1"}}
ctx := context.Background()
ctx := t.Context()
fields, _, err := client.Projects.ListProjectFieldsForOrg(ctx, "o", 1, opts)
if err != nil {
t.Fatalf("Projects.ListProjectFieldsForOrg returned error: %v", err)
}

if len(fields) != 2 {
t.Fatalf("Projects.ListProjectFieldsForOrg returned %d fields, want 2", len(fields))
t.Fatalf("Projects.ListProjectFieldsForOrg returned %v fields, want 2", len(fields))
}

field1 := fields[0]
if field1.ID == nil || *field1.ID != 1 || field1.Name != "Status" || field1.DataType != "single_select" {
t.Errorf("First field: got ID=%v, Name=%s, DataType=%s; want 1, Status, single_select", field1.ID, field1.Name, field1.DataType)
t.Errorf("First field: got ID=%v, Name=%v, DataType=%v; want 1, Status, single_select", field1.ID, field1.Name, field1.DataType)
}
if len(field1.Options) != 2 {
t.Errorf("First field options: got %d, want 2", len(field1.Options))
t.Errorf("First field options: got %v, want 2", len(field1.Options))
} else {
getName := func(o *any) string {
if o == nil || *o == nil {
Expand All @@ -349,10 +349,10 @@ func TestProjectsService_ListProjectFieldsForOrg(t *testing.T) {
// Validate second field (without options)
field2 := fields[1]
if field2.ID == nil || *field2.ID != 2 || field2.Name != "Priority" || field2.DataType != "text" {
t.Errorf("Second field: got ID=%v, Name=%s, DataType=%s; want 2, Priority, text", field2.ID, field2.Name, field2.DataType)
t.Errorf("Second field: got ID=%v, Name=%v, DataType=%v; want 2, Priority, text", field2.ID, field2.Name, field2.DataType)
}
if len(field2.Options) != 0 {
t.Errorf("Second field options: got %d, want 0", len(field2.Options))
t.Errorf("Second field options: got %v, want 0", len(field2.Options))
}

const methodName = "ListProjectFieldsForOrg"
Expand All @@ -370,7 +370,7 @@ func TestProjectsService_ListProjectFieldsForOrg(t *testing.T) {
})

// still allow both set (no validation enforced) – ensure it does not error
ctxBypass := context.WithValue(context.Background(), BypassRateLimitCheck, true)
ctxBypass := context.WithValue(t.Context(), BypassRateLimitCheck, true)
if _, _, err = client.Projects.ListProjectFieldsForOrg(ctxBypass, "o", 1, &ListProjectsOptions{ListProjectsPaginationOptions: ListProjectsPaginationOptions{Before: "b", After: "a"}}); err != nil {
t.Fatalf("unexpected error when both before/after set: %v", err)
}
Expand Down Expand Up @@ -401,7 +401,7 @@ func TestProjectsService_ListProjectFieldsForOrg_pagination(t *testing.T) {
http.Error(w, "unexpected query", http.StatusBadRequest)
})

ctx := context.Background()
ctx := t.Context()
first, resp, err := client.Projects.ListProjectFieldsForOrg(ctx, "o", 1, nil)
if err != nil {
t.Fatalf("first page error: %v", err)
Expand Down
13 changes: 4 additions & 9 deletions test/integration/projects_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package integration

import (
"context"
"os"
"testing"

Expand All @@ -32,15 +31,13 @@ import (
// GITHUB_TEST_REPO (repo name)

func TestProjectsV2_Org(t *testing.T) {
if !checkAuth("TestProjectsV2_Org") {
return
}
skipIfMissingAuth(t)
org := os.Getenv("GITHUB_TEST_ORG")
if org == "" {
t.Skip("GITHUB_TEST_ORG not set")
}

ctx := context.Background()
ctx := t.Context()

opts := &github.ListProjectsOptions{}
// List projects for org; pick the first available project we can read.
Expand Down Expand Up @@ -76,15 +73,13 @@ func TestProjectsV2_Org(t *testing.T) {
}

func TestProjectsV2_User(t *testing.T) {
if !checkAuth("TestProjectsV2_User") {
return
}
skipIfMissingAuth(t)
user := os.Getenv("GITHUB_TEST_USER")
if user == "" {
t.Skip("GITHUB_TEST_USER not set")
}

ctx := context.Background()
ctx := t.Context()
opts := &github.ListProjectsOptions{}
projects, _, err := client.Projects.ListProjectsForUser(ctx, user, opts)
if err != nil {
Expand Down
Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载