Skip to content

Fix intermittently failing unit test for ActiveSolutionTracker #38

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

Merged
edriouk merged 1 commit into from
Mar 11, 2026
Merged

Fix intermittently failing unit test for ActiveSolutionTracker #38

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
35 changes: 28 additions & 7 deletions src/solutions/active-solution-tracker.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { WorkspaceFolder } from 'vscode';
import { URI } from 'vscode-uri';
import * as path from 'path';
import { waitForEvent, waitTimeout } from '../__test__/test-waits';
import { waitForCondition } from '../__test__/wait-for-condition';
import { messageProviderFactory } from '../vscode-api/message-provider.factories';
import { commandsProviderFactory, MockCommandsProvider } from '../vscode-api/commands-provider.factories';
import { MockFileWatcherProvider, fileWatcherProviderFactory } from '../vscode-api/file-watcher-provider.factories';
Expand Down Expand Up @@ -99,7 +100,11 @@ describe('ActiveSolutionTracker', () => {

it('searches for solution files on activation', async () => {
await activeSolutionTracker.activate(context as unknown as vscode.ExtensionContext);
await waitTimeout();
await waitForCondition(
async () => (vscode.workspace.findFiles as jest.Mock).mock.calls.length > 0,
'solution file search to be triggered after activation',
200,
);

expect(vscode.workspace.findFiles).toHaveBeenCalledTimes(1);
expect(vscode.workspace.findFiles).toHaveBeenCalledWith(ActiveSolutionTrackerImpl.GLOB_PATTERN, undefined);
Expand All @@ -110,15 +115,23 @@ describe('ActiveSolutionTracker', () => {
configurationProvider.getConfigVariable.mockImplementation((name: string) => name === manifest.CONFIG_EXCLUDE ? testGlobPattern : undefined);

await activeSolutionTracker.activate(context as unknown as vscode.ExtensionContext);
await waitTimeout();
await waitForCondition(
async () => (vscode.workspace.findFiles as jest.Mock).mock.calls.length > 0,
'solution file search to be triggered with configured exclude glob',
200,
);

expect(vscode.workspace.findFiles).toHaveBeenCalledTimes(1);
expect(vscode.workspace.findFiles).toHaveBeenCalledWith(ActiveSolutionTrackerImpl.GLOB_PATTERN, testGlobPattern);
});

it('updates when the configured glob pattern changes', async () => {
await activeSolutionTracker.activate(context as unknown as vscode.ExtensionContext);
await waitTimeout();
await waitForCondition(
async () => (vscode.workspace.findFiles as jest.Mock).mock.calls.length > 0,
'initial solution file search to complete',
200,
);

(vscode.workspace.findFiles as jest.Mock).mockClear();

Expand All @@ -128,7 +141,11 @@ describe('ActiveSolutionTracker', () => {
const testGlobPattern = faker.word.words();
configurationProvider.getConfigVariable.mockImplementation((name: string) => name === manifest.CONFIG_EXCLUDE ? testGlobPattern : undefined);
configurationProvider.onChangeConfiguration.mock.calls[0][0]();
await waitTimeout();
await waitForCondition(
async () => (vscode.workspace.findFiles as jest.Mock).mock.calls.length > 0,
'solution file search to run after configuration change',
200,
);

expect(vscode.workspace.findFiles).toHaveBeenCalledTimes(1);
expect(vscode.workspace.findFiles).toHaveBeenCalledWith(ActiveSolutionTrackerImpl.GLOB_PATTERN, testGlobPattern);
Expand All @@ -139,7 +156,11 @@ describe('ActiveSolutionTracker', () => {
(vscode.workspace.findFiles as jest.Mock).mockResolvedValue([]);

await activeSolutionTracker.activate(context as unknown as vscode.ExtensionContext);
await waitTimeout();
await waitForCondition(
async () => (vscode.workspace.findFiles as jest.Mock).mock.calls.length > 0,
'solution file search to complete in empty workspace',
200,
);
});

it('has no solutions or active solution', () => {
Expand Down Expand Up @@ -227,7 +248,7 @@ describe('ActiveSolutionTracker', () => {

it('selects no active solution', async () => {
await activeSolutionTracker.activate(context as unknown as vscode.ExtensionContext);
await waitTimeout();
await waitForEvent(activeSolutionTracker.onDidChangeSolutions);

expect(activeSolutionTracker.solutions).toEqual([
SOLUTION_URI_BAR.fsPath,
Expand Down Expand Up @@ -489,7 +510,7 @@ describe('ActiveSolutionTracker solution file watching', () => {
);

await tracker.activate(context as unknown as vscode.ExtensionContext);
await waitTimeout();
await waitForEvent(tracker.onDidChangeActiveSolution);

changeListener = jest.fn();
tracker.onActiveSolutionFilesChanged(changeListener);
Expand Down