Skip to content

Fix wording for single PR stack #9028

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
Alex Ross (alexr00) merged 2 commits into from
Oct 7, 2026
Merged

Fix wording for single PR stack #9028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b4dd6f
Fix wording for single PR stack
alexr00 Oct 7, 2026
6148adf
Merge branch 'main' into alexr00/widespread-tyrannosaurus
alexr00 Oct 7, 2026
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
2 changes: 1 addition & 1 deletion webviews/components/pullRequestStack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const StackSection = ({ pr }: { pr: PullRequest }) => {
<span className="stack-description">
{pr.state === GithubItemStateEnum.Open && openBelow > 0
? `Merging this pull request will also merge ${openBelow} pull request${openBelow === 1 ? '' : 's'} below it.`
: `${stack.size} pull requests in this stack.`}
: `${stack.size} pull request${stack.size === 1 ? '' : 's'} in this stack.`}
</span>
</span>
<span className="stack-chevron">{chevronDownIcon}</span>
Expand Down
23 changes: 22 additions & 1 deletion webviews/editorWebview/test/overview.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,27 @@ describe('Overview', function () {
assert.strictEqual((out.getByText('Unstack all') as HTMLButtonElement).disabled, false);
});

it('uses singular wording for single-member stacks, including a retained merged PR', function () {
for (const state of [GithubItemStateEnum.Open, GithubItemStateEnum.Closed, GithubItemStateEnum.Merged]) {
const pr = new PullRequestBuilder().number(793).state(state).stack({
position: 1, size: 1, base: 'main',
pullRequests: [{
position: 1, number: 793, title: 'First Change', head: 'D1', url: 'https://example.com/793',
state, isDraft: false, mergeable: PullRequestMergeability.Unknown,
}],
}).build();
const out = render(
<PullRequestContext.Provider value={new PRContext(pr)}>
<Overview {...pr} />
</PullRequestContext.Provider>,
);

assert.strictEqual(out.container.querySelector('.stack-description')?.textContent, '1 pull request in this stack.');
assert.strictEqual(out.container.querySelector('.stack-badge')?.textContent?.trim(), '1/1');
out.unmount();
}
});

it('offers Update stack for an open, conflict-free stack without collapsing the heading', async function () {
const stack = {
position: 2, size: 2, base: 'main',
Expand Down Expand Up @@ -400,7 +421,7 @@ describe('Overview', function () {
</PullRequestContext.Provider>,
);

assert(out.container.querySelector('#pull-request-stack')?.textContent?.includes('2 pull requests in this stack.'));
assert.strictEqual(out.container.querySelector('.stack-description')?.textContent, '2 pull requests in this stack.');
assert.deepStrictEqual([...out.container.querySelectorAll('.stack-entry-readiness')].map(entry => entry.getAttribute('aria-label')), [
'Mergeability is being checked',
'Closed pull request cannot be merged',
Expand Down
Loading