lint and cleanup

Author: GrantBirki

internal/cmd/match_criteria_test.go

@@ -400,17 +400,17 @@ func TestPrMatchesCriteria(t *testing.T) {
 
 	// Test cases
 	tests := []struct {
-		name              string
-		branch            string
-		prLabels          []string
-		combineBranch     string
-		ignoreLabelsVal   []string
-		selectLabelsVal   []string
-		caseSensitiveVal  bool
-		branchPrefixVal   string
-		branchSuffixVal   string
-		branchRegexVal    string
-		want              bool
+		name             string
+		branch           string
+		prLabels         []string
+		combineBranch    string
+		ignoreLabelsVal  []string
+		selectLabelsVal  []string
+		caseSensitiveVal bool
+		branchPrefixVal  string
+		branchSuffixVal  string
+		branchRegexVal   string
+		want             bool
 	}{
 		{
 			name:            "All criteria match",
@@ -504,19 +504,6 @@ func TestPrMatchesCriteria(t *testing.T) {
 	}
 }
 
-// Mock GraphQL client for testing
-type mockGraphQLClient struct {
-	response interface{}
-	err      error
-}
-
-func (m *mockGraphQLClient) Query(name string, query interface{}, variables map[string]interface{}) error {
-	if m.err != nil {
-		return m.err
-	}
-	return nil
-}
-
 func TestIsCIPassing(t *testing.T) {
 	tests := []struct {
 		name     string
@@ -1033,18 +1020,18 @@ func TestPrMeetsRequirements(t *testing.T) {
 	// Save original global variables
 	origRequireCI := requireCI
 	origMustBeApproved := mustBeApproved
-	
+
 	// Restore original values after test
 	defer func() {
 		requireCI = origRequireCI
 		mustBeApproved = origMustBeApproved
 	}()
-	
+
 	// Only test the simple case where no requirements are specified
 	t.Run("No requirements specified", func(t *testing.T) {
 		requireCI = false
 		mustBeApproved = false
-		
+
 		// Skip this test since we can't easily create a mock graphql client
 		// The logic is simple enough that we know it would return true when both flags are false
 		t.Skip("Skipping test that requires a real GraphQL client")

internal/common/common_test.go

@@ -46,4 +46,4 @@ func TestNormalizeArray(t *testing.T) {
 			}
 		})
 	}
-}
+}

internal/version/version_test.go

@@ -11,85 +11,85 @@ func TestString(t *testing.T) {
 	origCommit := commit
 	origDate := date
 	origBuildInfoReader := buildInfoReader
-	
+
 	// Restore original values after the test
 	defer func() {
 		tag = origTag
 		commit = origCommit
 		date = origDate
 		buildInfoReader = origBuildInfoReader
 	}()
-	
+
 	// Test 1: With preset values (simulating ldflags setting)
 	t.Run("with preset values", func(t *testing.T) {
 		// Set known values for testing
 		tag = "v1.0.0"
 		commit = "abc123"
 		date = "2025-04-15"
-		
+
 		// Mock the buildInfoReader to return false so that preset values are used
 		buildInfoReader = func() (*debug.BuildInfo, bool) {
 			return nil, false
 		}
-		
+
 		result := String()
-		
+
 		// Test the full format
 		expected := "v1.0.0 (abc123) built at 2025-04-15\nhttps://github.com/github/gh-combine/releases/tag/v1.0.0"
 		if result != expected {
 			t.Errorf("Expected version string to be:\n%q\nbut got:\n%q", expected, result)
 		}
 	})
-	
+
 	// Test 2: With mock build info that updates commit and date
 	t.Run("with mock build info", func(t *testing.T) {
 		// Set initial values
 		tag = "dev"
 		commit = "initial-commit"
 		date = "initial-date"
-		
+
 		// Create mock build info with specific values
 		mockSettings := []debug.BuildSetting{
 			{Key: "vcs.revision", Value: "mock-commit-hash"},
 			{Key: "vcs.time", Value: "mock-build-time"},
 			{Key: "other.key", Value: "other-value"},
 		}
-		
+
 		buildInfoReader = func() (*debug.BuildInfo, bool) {
 			return &debug.BuildInfo{
 				Settings: mockSettings,
 			}, true
 		}
-		
+
 		result := String()
-		
+
 		// Check if the values from build info were used
 		expected := "dev (mock-commit-hash) built at mock-build-time\nhttps://github.com/github/gh-combine/releases/tag/dev"
 		if result != expected {
 			t.Errorf("Expected version string to be:\n%q\nbut got:\n%q", expected, result)
 		}
 	})
-	
+
 	// Test 3: With empty build info settings
 	t.Run("with empty build info settings", func(t *testing.T) {
 		// Set initial values
 		tag = "dev"
 		commit = "unchanged-commit"
 		date = "unchanged-date"
-		
+
 		// Empty build settings
 		buildInfoReader = func() (*debug.BuildInfo, bool) {
 			return &debug.BuildInfo{
 				Settings: []debug.BuildSetting{},
 			}, true
 		}
-		
+
 		result := String()
-		
+
 		// The values should remain unchanged
 		expected := "dev (unchanged-commit) built at unchanged-date\nhttps://github.com/github/gh-combine/releases/tag/dev"
 		if result != expected {
 			t.Errorf("Expected version string to be:\n%q\nbut got:\n%q", expected, result)
 		}
 	})
-}
+}