Merge branch 'main' into pr-checkout-url

untitaker · web-flow · commit d9281204b6fd · 2026-05-26T15:28:38.000+02:00
diff --git a/internal/resolve/resolve_test.go b/internal/resolve/resolve_test.go
@@ -63,6 +63,8 @@ func TestTokenForDomain(t *testing.T) {
 	}
 
 	// FORGE_TOKEN is a fallback for any domain
+	t.Setenv("GITHUB_TOKEN", "")
+	t.Setenv("GH_TOKEN", "")
 	t.Setenv("FORGE_TOKEN", "forge-tok")
 	got = TokenForDomain("github.com")
 	if got != "forge-tok" {
@@ -105,6 +107,8 @@ func TestTokenForDomainEnvSpecificOverridesFallback(t *testing.T) {
 }
 
 func TestTokenForDomainEnvFallbackToForgeToken(t *testing.T) {
+	t.Setenv("GITHUB_TOKEN", "")
+	t.Setenv("GH_TOKEN", "")
 	t.Setenv("FORGE_TOKEN", "forge-fallback")
 
 	got := TokenForDomainEnv("github.com")

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@ func TestTokenForDomain(t *testing.T) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`// FORGE_TOKEN is a fallback for any domain`
	`66`	`+ t.Setenv("GITHUB_TOKEN", "")`
	`67`	`+ t.Setenv("GH_TOKEN", "")`
`66`	`68`	`t.Setenv("FORGE_TOKEN", "forge-tok")`
`67`	`69`	`got = TokenForDomain("github.com")`
`68`	`70`	`if got != "forge-tok" {`
`@@ -105,6 +107,8 @@ func TestTokenForDomainEnvSpecificOverridesFallback(t *testing.T) {`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`func TestTokenForDomainEnvFallbackToForgeToken(t *testing.T) {`
	`110`	`+ t.Setenv("GITHUB_TOKEN", "")`
	`111`	`+ t.Setenv("GH_TOKEN", "")`
`108`	`112`	`t.Setenv("FORGE_TOKEN", "forge-fallback")`
`109`	`113`
`110`	`114`	`got := TokenForDomainEnv("github.com")`