Skip to content
Open
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
135 changes: 131 additions & 4 deletions src/client/components/DiffQuickMenu.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ describe('DiffQuickMenu', () => {
fireEvent.click(screen.getByRole('button', { name: /Revision menu:/ }));
fireEvent.click(screen.getByRole('button', { name: 'Pick Commit...' }));

const commitButtons = await screen.findAllByRole('button', { name: /1f23cd1/ });
const commitButtons = await screen.findAllByRole('button', {
name: /1f23cd1/,
});
const highlightedCommitButton = commitButtons.find((button) =>
button.className.includes('border-l-diff-selected-border'),
);
Expand All @@ -104,7 +106,9 @@ describe('DiffQuickMenu', () => {
screen.getByRole('button', { name: 'main...Uncommitted (merge-base)' }),
).toBeInTheDocument();
expect(
screen.getByRole('button', { name: 'origin/main...Uncommitted (merge-base)' }),
screen.getByRole('button', {
name: 'origin/main...Uncommitted (merge-base)',
}),
).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'HEAD' })).toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'HEAD...Staging' })).not.toBeInTheDocument();
Expand Down Expand Up @@ -163,7 +167,11 @@ describe('DiffQuickMenu', () => {
);

fireEvent.click(screen.getByRole('button', { name: /Revision menu:/ }));
fireEvent.click(screen.getByRole('button', { name: 'origin/main...Uncommitted (merge-base)' }));
fireEvent.click(
screen.getByRole('button', {
name: 'origin/main...Uncommitted (merge-base)',
}),
);

expect(onSelectDiff).toHaveBeenCalledWith({
baseCommitish: 'origin/main',
Expand All @@ -172,11 +180,130 @@ describe('DiffQuickMenu', () => {
});
});

it('filters the menu down to matching commits when typing in the search box', () => {
render(
createElement(DiffQuickMenu, {
options,
selection: { baseCommitish: 'HEAD', targetCommitish: '.' },
onSelectDiff: vi.fn(),
onOpenAdvanced: vi.fn(),
}),
);

fireEvent.click(screen.getByRole('button', { name: /Revision menu:/ }));
fireEvent.change(screen.getByPlaceholderText('Filter branches and commits...'), {
target: { value: 'release' },
});

expect(screen.getByRole('button', { name: /1f23cd1/ })).toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'HEAD' })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'Pick Commit...' })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'Detailed...' })).not.toBeInTheDocument();
});

it('selects commit^...commit when a filtered commit is clicked', () => {
const onSelectDiff = vi.fn();
render(
createElement(DiffQuickMenu, {
options,
selection: { baseCommitish: 'HEAD', targetCommitish: '.' },
onSelectDiff,
onOpenAdvanced: vi.fn(),
}),
);

fireEvent.click(screen.getByRole('button', { name: /Revision menu:/ }));
fireEvent.change(screen.getByPlaceholderText('Filter branches and commits...'), {
target: { value: 'release' },
});
fireEvent.click(screen.getByRole('button', { name: /1f23cd1/ }));

expect(onSelectDiff).toHaveBeenCalledWith({
baseCommitish: '1f23cd1^',
targetCommitish: '1f23cd1',
});
});

it('selects branch...Uncommitted (merge-base) when a filtered branch is clicked', () => {
const onSelectDiff = vi.fn();
render(
createElement(DiffQuickMenu, {
options,
selection: { baseCommitish: 'HEAD', targetCommitish: '.' },
onSelectDiff,
onOpenAdvanced: vi.fn(),
}),
);

fireEvent.click(screen.getByRole('button', { name: /Revision menu:/ }));
fireEvent.change(screen.getByPlaceholderText('Filter branches and commits...'), {
target: { value: 'main' },
});

const branchesSection = screen.getByText('Branches').parentElement;
expect(branchesSection).not.toBeNull();
fireEvent.click(
within(branchesSection!).getByRole('button', {
name: /main \(current\)/,
}),
);

expect(onSelectDiff).toHaveBeenCalledWith({
baseCommitish: 'main',
targetCommitish: '.',
baseMode: 'merge-base',
});
});

it('selects the first match when pressing Enter in the search box', () => {
const onSelectDiff = vi.fn();
render(
createElement(DiffQuickMenu, {
options,
selection: { baseCommitish: 'HEAD', targetCommitish: '.' },
onSelectDiff,
onOpenAdvanced: vi.fn(),
}),
);

fireEvent.click(screen.getByRole('button', { name: /Revision menu:/ }));
const searchInput = screen.getByPlaceholderText('Filter branches and commits...');
fireEvent.change(searchInput, { target: { value: 'v3.1.5' } });
fireEvent.keyDown(searchInput, { key: 'Enter' });

expect(onSelectDiff).toHaveBeenCalledWith({
baseCommitish: '1f23cd1^',
targetCommitish: '1f23cd1',
});
});

it('shows an empty state when nothing matches the search query', () => {
render(
createElement(DiffQuickMenu, {
options,
selection: { baseCommitish: 'HEAD', targetCommitish: '.' },
onSelectDiff: vi.fn(),
onOpenAdvanced: vi.fn(),
}),
);

fireEvent.click(screen.getByRole('button', { name: /Revision menu:/ }));
fireEvent.change(screen.getByPlaceholderText('Filter branches and commits...'), {
target: { value: 'does-not-exist' },
});

expect(screen.getByText('No matching branches or commits')).toBeInTheDocument();
});

it('shows merge-base in the current label', () => {
render(
createElement(DiffQuickMenu, {
options,
selection: { baseCommitish: 'origin/main', targetCommitish: '.', baseMode: 'merge-base' },
selection: {
baseCommitish: 'origin/main',
targetCommitish: '.',
baseMode: 'merge-base',
},
onSelectDiff: vi.fn(),
onOpenAdvanced: vi.fn(),
}),
Expand Down
Loading