Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .vscode-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ const { defineConfig } = require("@vscode/test-cli");

module.exports = defineConfig({
files: "out/test/**/*.test.js",
mocha: { ui: "bdd" },
mocha: {
ui: "bdd",
timeout: 5000,
},
workspaceFolder: "test/bazel_workspace",
});
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions test/bazel_workspace/buildifier/buildifier_good
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
# Read all input from stdin to prevent EPIPE errors
cat > /dev/null
echo '{
"success": false,
"files": [
Expand Down
2 changes: 2 additions & 0 deletions test/bazel_workspace/buildifier/buildifier_old
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
#!/bin/bash
# Read all input from stdin to prevent EPIPE errors
cat > /dev/null
echo 'Some output that is not valid JSON'
30 changes: 15 additions & 15 deletions test/buildifier.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ async function openSourceFile(sourceFile: string) {
await vscode.window.showTextDocument(doc, vscode.ViewColumn.One, false);
}

let disposables: vscode.Disposable[] = [];
describe("buildifier", () => {
let disposables: vscode.Disposable[] = [];

afterEach(() => {
for (const disposable of disposables) {
disposable.dispose();
}
disposables = [];
});
afterEach(() => {
for (const disposable of disposables) {
disposable.dispose();
}
disposables = [];
});

const workspacePath = path.join(
__dirname,
"..",
"..",
"test",
"bazel_workspace",
);
const workspacePath = path.join(
__dirname,
"..",
"..",
"test",
"bazel_workspace",
);

describe("buildifier", () => {
it("diagnostics are added from buildifier", async () => {
// Create DiagnosticsManager and open file
const buildFile = path.join(workspacePath, "buildifier", "BUILD");
Expand Down
15 changes: 4 additions & 11 deletions test/buildifier_availability.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,17 @@ describe("buildifier_availability", () => {
process.env.PATH = buildifierDirPath + path.delimiter + process.env.PATH;
}

async function removeVscodeSettings(): Promise<void> {
await fs.rm(path.join(testWorkspace, ".vscode"), {
recursive: true,
force: true,
});
}

beforeEach(async () => {
// Restore original PATH before each test
process.env.PATH = originalPath;
// Remove vscode settings
await removeVscodeSettings();
// Restore vscode settings
await setBuildifierExecutableConfig(undefined);
});
afterEach(async () => {
// Restore original PATH before each test
process.env.PATH = originalPath;
// Remove vscode settings
await removeVscodeSettings();
// Restore vscode settings
await setBuildifierExecutableConfig(undefined);
});

describe("checkBuildifierIsAvailable", () => {
Expand Down
Loading