Remove Jest testMatch discovery override

Author: cbasitodx

internal/framework/jest.go

@@ -100,9 +100,6 @@ func (j *Jest) DiscoverTestFiles(ctx context.Context, testFiles discovery.TestFi
 	command, baseArgs := j.getJestCommand()
 	args := slices.Clone(baseArgs)
 	args = append(args, "--listTests")
-	if settings.GetTestsLocation() != "" && testFiles.Pattern != "" {
-		args = append(args, "--testMatch", testFiles.Pattern)
-	}
 
 	slog.Info("Discovering Jest test files with command", "command", command, "args", args)
 	output, err := j.executor.CombinedOutput(ctx, command, args, j.discoveryEnv())
@@ -114,7 +111,12 @@ func (j *Jest) DiscoverTestFiles(ctx context.Context, testFiles discovery.TestFi
 		return nil, fmt.Errorf("failed to discover Jest test files: %s: %w", message, err)
 	}
 
-	return parseJestListTestsOutput(output), nil
+	discoveredFiles := parseJestListTestsOutput(output)
+	if settings.GetTestsLocation() == "" && settings.GetTestsExcludePattern() == "" {
+		return discoveredFiles, nil
+	}
+
+	return filterJestTestFiles(discoveredFiles, testFiles)
 }
 
 func (j *Jest) RunTests(ctx context.Context, testFiles []string, envMap map[string]string) error {
@@ -167,6 +169,31 @@ func jestTestFileExtensionPattern() string {
 	return "{" + strings.Join(jestTestFileExtensions, ",") + "}"
 }
 
+func filterJestTestFiles(testFiles []string, selectedTestFiles discovery.TestFileSet) ([]string, error) {
+	if settings.GetTestsLocation() == "" {
+		selectedTestFiles.Pattern = ""
+	}
+
+	testFileMatcher, err := discovery.NewTestFileSetMatcher(selectedTestFiles, settings.GetTestsExcludePattern())
+	if err != nil {
+		return nil, err
+	}
+
+	filteredFiles := make([]string, 0, len(testFiles))
+	for _, testFile := range testFiles {
+		normalizedTestFile := utils.NormalizePath(testFile)
+		if normalizedTestFile == "" {
+			continue
+		}
+		if testFileMatcher.MatchNormalizedPath(normalizedTestFile) {
+			filteredFiles = append(filteredFiles, normalizedTestFile)
+		}
+	}
+
+	slices.Sort(filteredFiles)
+	return slices.Compact(filteredFiles), nil
+}
+
 func stripNodeOptionsRequire(nodeOptions string, module string) string {
 	fields := strings.Fields(nodeOptions)
 	stripped := make([]string, 0, len(fields))

internal/framework/jest_test.go

@@ -204,15 +204,20 @@ func TestJest_DiscoverTestFiles_StripsInheritedNodeOptions(t *testing.T) {
 	}
 }
 
-func TestJest_DiscoverTestFiles_WithTestsLocationUsesTestMatch(t *testing.T) {
+func TestJest_DiscoverTestFiles_WithTestsLocationFiltersListTestsOutput(t *testing.T) {
 	tempDir := t.TempDir()
 	oldWd, _ := os.Getwd()
 	defer func() { _ = os.Chdir(oldWd) }()
 	if err := os.Chdir(tempDir); err != nil {
 		t.Fatalf("failed to chdir: %v", err)
 	}
 
-	for _, file := range []string{"custom/a.check.js", "custom/b.check.js", "src/c.test.js"} {
+	for _, file := range []string{
+		"custom/unit/a.check.js",
+		"custom/unit/b.check.js",
+		"custom/not-listed.check.js",
+		"src/c.test.js",
+	} {
 		if err := os.MkdirAll(filepath.Dir(file), 0755); err != nil {
 			t.Fatalf("failed to create dir for %s: %v", file, err)
 		}
@@ -221,13 +226,14 @@ func TestJest_DiscoverTestFiles_WithTestsLocationUsesTestMatch(t *testing.T) {
 		}
 	}
 
-	setTestsLocation(t, "custom/*.check.js")
+	setTestsLocation(t, "./custom/**/*.check.js")
 
 	var capturedName string
 	var capturedArgs []string
 	mockExecutor := &jestCommandExecutor{
-		output: []byte(filepath.Join(tempDir, "custom", "b.check.js") + "\n" +
-			filepath.Join(tempDir, "custom", "a.check.js") + "\n"),
+		output: []byte(filepath.Join(tempDir, "custom", "unit", "b.check.js") + "\n" +
+			filepath.Join(tempDir, "src", "c.test.js") + "\n" +
+			filepath.Join(tempDir, "custom", "unit", "a.check.js") + "\n"),
 		onExecution: func(name string, args []string) {
 			capturedName = name
 			capturedArgs = slices.Clone(args)
@@ -242,12 +248,73 @@ func TestJest_DiscoverTestFiles_WithTestsLocationUsesTestMatch(t *testing.T) {
 	if capturedName != "npx" {
 		t.Errorf("expected command %q, got %q", "npx", capturedName)
 	}
-	expectedArgs := []string{"jest", "--listTests", "--testMatch", "custom/*.check.js"}
+	expectedArgs := []string{"jest", "--listTests"}
 	if !slices.Equal(capturedArgs, expectedArgs) {
 		t.Errorf("expected args %v, got %v", expectedArgs, capturedArgs)
 	}
 
-	expected := []string{"custom/a.check.js", "custom/b.check.js"}
+	expected := []string{"custom/unit/a.check.js", "custom/unit/b.check.js"}
+	if !slices.Equal(files, expected) {
+		t.Errorf("expected files %v, got %v", expected, files)
+	}
+}
+
+func TestJest_DiscoverTestFiles_WithTestsLocationReturnsInvalidPatternError(t *testing.T) {
+	setTestsLocation(t, "custom/[")
+
+	mockExecutor := &jestCommandExecutor{
+		output: []byte("custom/a.check.js\n"),
+	}
+	jest := &Jest{executor: mockExecutor, platformEnv: make(map[string]string)}
+
+	_, err := jest.DiscoverTestFiles(context.Background(), discovery.TestFileSet{Pattern: jest.TestPattern()})
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	if !strings.Contains(err.Error(), "invalid tests location pattern") {
+		t.Fatalf("unexpected error: %v", err)
+	}
+}
+
+func TestJest_DiscoverTestFiles_WithTestsExcludePatternFiltersListTestsOutput(t *testing.T) {
+	tempDir := t.TempDir()
+	oldWd, _ := os.Getwd()
+	defer func() { _ = os.Chdir(oldWd) }()
+	if err := os.Chdir(tempDir); err != nil {
+		t.Fatalf("failed to chdir: %v", err)
+	}
+
+	for _, file := range []string{"src/a.test.js", "src/system/b.test.js"} {
+		if err := os.MkdirAll(filepath.Dir(file), 0755); err != nil {
+			t.Fatalf("failed to create dir for %s: %v", file, err)
+		}
+		if err := os.WriteFile(file, []byte("test"), 0644); err != nil {
+			t.Fatalf("failed to create %s: %v", file, err)
+		}
+	}
+
+	setTestsExcludePattern(t, "src/system/**/*.test.js")
+
+	var capturedArgs []string
+	mockExecutor := &jestCommandExecutor{
+		output: []byte(filepath.Join(tempDir, "src", "system", "b.test.js") + "\n" +
+			filepath.Join(tempDir, "src", "a.test.js") + "\n"),
+		onExecution: func(name string, args []string) {
+			capturedArgs = slices.Clone(args)
+		},
+	}
+	jest := &Jest{executor: mockExecutor, platformEnv: make(map[string]string)}
+	files, err := jest.DiscoverTestFiles(context.Background(), discovery.TestFileSet{Pattern: jest.TestPattern()})
+	if err != nil {
+		t.Fatalf("DiscoverTestFiles failed: %v", err)
+	}
+
+	expectedArgs := []string{"jest", "--listTests"}
+	if !slices.Equal(capturedArgs, expectedArgs) {
+		t.Errorf("expected args %v, got %v", expectedArgs, capturedArgs)
+	}
+
+	expected := []string{"src/a.test.js"}
 	if !slices.Equal(files, expected) {
 		t.Errorf("expected files %v, got %v", expected, files)
 	}