Fix ci tests

Author: AdamDrewsTR

cmd/diagnostics/doctor_test.go

@@ -1316,6 +1316,9 @@ func TestCheckShellEnvironment(t *testing.T) {
 }
 
 func TestOfferShellEnvironmentFix(t *testing.T) {
+	// Clear CI environment to ensure consistent test behavior
+	defer testutil.ClearCIEnvironment(t)()
+
 	tmpDir := t.TempDir()
 	cfg := &config.Config{
 		Root: tmpDir,

internal/cmdutil/interactive_test.go

@@ -5,10 +5,14 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/go-nv/goenv/testing/testutil"
 	"github.com/spf13/cobra"
 )
 
 func TestNewInteractiveContext(t *testing.T) {
+	// Clear CI environment to ensure consistent test behavior
+	defer testutil.ClearCIEnvironment(t)()
+
 	tests := []struct {
 		name          string
 		setupCmd      func() *cobra.Command

testing/testutil/helpers.go

@@ -77,3 +77,49 @@ func StripDeprecationWarning(output string) string {
 	// Only trim trailing whitespace to preserve formatting of the output
 	return strings.TrimRight(result, " \t\n\r")
 }
+
+// ClearCIEnvironment temporarily clears CI-related environment variables for testing.
+// This ensures tests behave consistently regardless of whether they run locally or in CI.
+//
+// The function saves all CI environment variables, unsets them, and returns a cleanup
+// function that should be deferred to restore the original state.
+//
+// Accepts testing.TB so it works with both *testing.T and *testing.B.
+//
+// Example:
+//
+//	func TestSomething(t *testing.T) {
+//	    cleanup := testutil.ClearCIEnvironment(t)
+//	    defer cleanup()
+//	    // Test code here will run in non-CI mode
+//	}
+func ClearCIEnvironment(tb testing.TB) func() {
+	tb.Helper()
+
+	ciEnvVars := []string{
+		"GITHUB_ACTIONS",
+		"CI",
+		"GITLAB_CI",
+		"CIRCLECI",
+		"TRAVIS",
+		"BUILD_ID",
+		"BUILDKITE",
+		"DRONE",
+		"TEAMCITY_VERSION",
+	}
+
+	savedEnv := make(map[string]string)
+	for _, envVar := range ciEnvVars {
+		savedEnv[envVar] = os.Getenv(envVar)
+		os.Unsetenv(envVar)
+	}
+
+	return func() {
+		tb.Helper()
+		for envVar, value := range savedEnv {
+			if value != "" {
+				os.Setenv(envVar, value)
+			}
+		}
+	}
+}