fix: Improve report command tests and functionality (#10)

Improve report command tests and functionality

Author: vbvictor

Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build test clean lint vet fmt run
 
-all: build lint test install
+all: build lint install test
 
 grit:
 	go build -o grit ./grit

grit/cmd/report/report.go

@@ -79,6 +79,13 @@ var ReportCmd = &cobra.Command{
 		if err != nil {
 			return fmt.Errorf("error getting churn metrics: %w", err)
 		}
+
+		if churnOpts.SortBy == git.Commits {
+			for _, churn := range churns {
+				churn.Churn = churn.Commits
+			}
+		}
+
 		flag.LogIfVerbose("Got %d churn files\n", len(churns))
 
 		flag.LogIfVerbose("Analyzing complexity data...\n")

test/gritrepo_test.go

@@ -13,14 +13,16 @@ import (
 // 		You can install it via go install.
 // 		You can download it from https://github.com/vbvictor/grit/releases and place it in your PATH.
 
-func createTempRepo(t *testing.T) (tempPath, gritPath string) {
+func createTempRepo(t *testing.T) (string, string) { //nolint
 	t.Helper()
 
 	tempDir := t.TempDir()
 	gritDir := filepath.Join(tempDir, "grit")
 	err := os.MkdirAll(gritDir, 0o755)
 	require.NoError(t, err)
 
+	Unbundle(t, filepath.Join("..", "testdata", "bundles", "grit-test.bundle"), gritDir)
+
 	return tempDir, gritDir
 }
 
@@ -91,13 +93,3 @@ func TestGritBasicFunctionality(t *testing.T) {
 
 	RunGritTests(t, tests)
 }
-
-/*
-func newGritReportValidator(expectedOutputs ...string) OutputValidator {
-	return func(t *testing.T, stdout, _ string) bool {
-		t.Helper()
-
-		return false
-	}
-}
-*/

test/runner.go

@@ -39,7 +39,6 @@ func NewContainsValidator(expectedOutputs ...string) OutputValidator {
 	}
 }
 
-// RunGritTest runs a single grit test.
 func RunGritTest(t *testing.T, test GritTest) {
 	t.Helper()
 	t.Run(test.Name, func(t *testing.T) {
@@ -79,15 +78,13 @@ func RunGritTest(t *testing.T, test GritTest) {
 
 // findGritExecutable tries to find the grit executable in common locations.
 func findGritExecutable() (string, error) {
-	// Check if grit is in PATH
 	if path, err := exec.LookPath("grit"); err == nil {
 		return path, nil
 	}
 
 	return "", errors.New("could not find grit executable")
 }
 
-// RunGritTests runs multiple grit tests.
 func RunGritTests(t *testing.T, tests []GritTest) {
 	t.Helper()