Skip to content

fix(testController): exclude .bundle and vendor/bundle from test discovery #4210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bodapatisaikrishna wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(testController): exclude .bundle and vendor/bundle from test discovery #4210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions vscode/src/test/suite/testController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,4 +927,15 @@ suite("TestController", () => {

assert.ok(spy.calledOnce);
});

test("findFiles excludes .bundle and vendor/bundle from test discovery", async () => {
const spy = sandbox.spy(vscode.workspace, "findFiles");
await controller.testController.resolveHandler!(undefined);

assert.ok(spy.called);
const excludeArg = spy.firstCall.args[1] as vscode.RelativePattern;
assert.ok(excludeArg);
assert.match(excludeArg.pattern, /\.bundle/);
assert.match(excludeArg.pattern, /vendor\/bundle/);
});
});
17 changes: 15 additions & 2 deletions vscode/src/testController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const asyncExec = promisify(exec);

const NESTED_TEST_DIR_PATTERN = "**/{test,spec,features}/**/";
const TEST_FILE_PATTERN = `${NESTED_TEST_DIR_PATTERN}{*_test.rb,test_*.rb,*_spec.rb,*.feature}`;
const TEST_FILE_EXCLUDE_PATTERN = "**/{.bundle,vendor/bundle}/**";

interface CodeLensData {
type: string;
Expand Down Expand Up @@ -981,7 +982,8 @@ export class TestController {
for (const workspaceFolder of workspaceFolders) {
// Check if there is at least one Ruby test file in the workspace, otherwise we don't consider it
const pattern = this.testPattern(workspaceFolder);
const files = await vscode.workspace.findFiles(pattern, undefined, 1);
const excludePattern = this.testExcludePattern(workspaceFolder);
const files = await vscode.workspace.findFiles(pattern, excludePattern, 1);
if (files.length === 0) {
continue;
}
Expand All @@ -1002,7 +1004,8 @@ export class TestController {
) {
const initialCollection = item ? item.children : this.testController.items;
const pattern = this.testPattern(workspaceFolder);
const filePaths = await vscode.workspace.findFiles(pattern);
const excludePattern = this.testExcludePattern(workspaceFolder);
const filePaths = await vscode.workspace.findFiles(pattern, excludePattern);
const increment = Math.floor(filePaths.length / 100);

for (const uri of filePaths) {
Expand Down Expand Up @@ -1143,13 +1146,23 @@ export class TestController {
return true;
}

// Bundler can install gems into `.bundle/gems` or `vendor/bundle`. Tests inside those gem directories
// must not be discovered as workspace tests.
if (pathParts.includes(".bundle") || (pathParts.includes("vendor") && pathParts.includes("bundle"))) {
return true;
}

return false;
}

private testPattern(workspaceFolder: vscode.WorkspaceFolder) {
return new vscode.RelativePattern(workspaceFolder, TEST_FILE_PATTERN);
}

private testExcludePattern(workspaceFolder: vscode.WorkspaceFolder) {
return new vscode.RelativePattern(workspaceFolder, TEST_FILE_EXCLUDE_PATTERN);
}

private testDirectoryPosition(pathParts: string[]) {
let index = pathParts.indexOf("test");
if (index !== -1) {
Expand Down
Loading