Add more tests, reduce complexity

internal/scan/scanner.go

@@ -107,11 +107,7 @@ func (dScanner *DebrickedScanner) Scan(o IOptions) error {
 
 	debug.Log("Mapping environment variables...", dOptions.Debug)
 	MapEnvToOptions(&dOptions, e)
-
-	if dOptions.GenerateCommitName && dOptions.CommitName == "" {
-		debug.Log("No commit name set, generating commit name", dOptions.Debug)
-		dOptions.CommitName = GenerateCommitNameTimestamp()
-	}
+	UpdatedEmptyCommitName(&dOptions)
 
 	if err := SetWorkingDirectory(&dOptions); err != nil {
 		return err
@@ -339,6 +335,13 @@ func SetWorkingDirectory(d *DebrickedOptions) error {
 	return nil
 }
 
+func UpdatedEmptyCommitName(o *DebrickedOptions) {
+	if o.GenerateCommitName && o.CommitName == "" {
+		debug.Log("No commit name set, generating commit name", o.Debug)
+		o.CommitName = GenerateCommitNameTimestamp()
+	}
+}
+
 func GenerateCommitNameTimestamp() string {
 	return fmt.Sprintf("generated-%d", time.Now().Unix())
 }

internal/scan/scanner_test.go

@@ -519,6 +519,35 @@ var cases = []struct {
 	},
 }
 
+func TestUpdateEmptyCommitName(t *testing.T) {
+	opts := DebrickedOptions{
+		CommitName:         "",
+		GenerateCommitName: true,
+	}
+
+	UpdatedEmptyCommitName(&opts)
+	assert.Contains(t, opts.CommitName, "generated-")
+}
+
+func TestUpdateEmptyCommitNameNotEmpty(t *testing.T) {
+	opts := DebrickedOptions{
+		CommitName:         "test",
+		GenerateCommitName: true,
+	}
+
+	UpdatedEmptyCommitName(&opts)
+	assert.Equal(t, opts.CommitName, "test")
+}
+
+func TestUpdateEmptyCommitNameNoGenerateCommitNameSet(t *testing.T) {
+	opts := DebrickedOptions{
+		CommitName: "",
+	}
+
+	UpdatedEmptyCommitName(&opts)
+	assert.Empty(t, opts.CommitName)
+}
+
 func TestGenerateCommitName(t *testing.T) {
 	res := GenerateCommitNameTimestamp()
 	assert.Contains(t, res, "generated-")