fix: improve clean handling

Author: G-Rath

snaps/clean.go

@@ -135,20 +135,20 @@ func Clean(m *testing.M, opts ...CleanOpts) (bool, error) {
 }
 
 // getTestID will return the testID if the line is in the form of [Test... - number]
-func getTestID(b []byte) (string, bool) {
+func getTestID(b []byte) (string, string, bool) {
 	if len(b) == 0 {
-		return "", false
+		return "", "", false
 	}
 
 	// needs to start with [Test and end with ]
 	if !bytes.HasPrefix(b, []byte("[Test")) || b[len(b)-1] != ']' {
-		return "", false
+		return "", "", false
 	}
 
 	// needs to contain at least one ' - ' seperator
 	firstSeparator := bytes.Index(b, []byte(" - "))
 	if firstSeparator == -1 {
-		return "", false
+		return "", "", false
 	}
 
 	// if there is a label, there will be a second seperator
@@ -160,10 +160,10 @@ func getTestID(b []byte) (string, bool) {
 
 	// needs to have a number after the first separator
 	if !isNumber(b[firstSeparator+3 : secondSeparator]) {
-		return "", false
+		return "", "", false
 	}
 
-	return string(b[1 : len(b)-1]), true
+	return string(b[1 : len(b)-1]), string(b[1 : secondSeparator]), true
 }
 
 func isNumber(b []byte) bool {
@@ -266,14 +266,14 @@ func examineSnaps(
 		for s.Scan() {
 			b := s.Bytes()
 			// Check if line is a test id
-			testID, match := getTestID(b)
+			testIDWithLabel, testIDWithoutLabel, match := getTestID(b)
 			if !match {
 				continue
 			}
-			testIDs = append(testIDs, testID)
+			testIDs = append(testIDs, testIDWithLabel)
 
-			if !registeredTests.Has(testID) && !testSkipped(testID, runOnly) {
-				obsoleteTests = append(obsoleteTests, testID)
+			if !registeredTests.Has(testIDWithoutLabel) && !testSkipped(testIDWithoutLabel, runOnly) {
+				obsoleteTests = append(obsoleteTests, testIDWithoutLabel)
 				needsUpdating = true
 
 				removeSnapshot(s)
@@ -284,7 +284,7 @@ func examineSnaps(
 				line := s.Bytes()
 
 				if bytes.Equal(line, endSequenceByteSlice) {
-					tests[testID] = data.String()
+					tests[testIDWithLabel] = data.String()
 
 					data.Reset()
 					break

snaps/clean_test.go

@@ -550,7 +550,7 @@ func TestGetTestID(t *testing.T) {
 			// indexing beyond the capacity will cause test to panic
 			b := make([]byte, 0, len(tc.input))
 			b = append(b, []byte(tc.input)...)
-			id, ok := getTestID(b)
+			id, _, ok := getTestID(b)
 
 			test.Equal(t, tc.valid, ok)
 			test.Equal(t, tc.expectedID, id)