Skip to content

feat(mobile): bring GitLab and Bitbucket pull request review to GitHub parity (stack 19/30) #6014

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

Closed
iscekic wants to merge 1 commit into from
Closed

feat(mobile): bring GitLab and Bitbucket pull request review to GitHub parity (stack 19/30) #6014

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
22 changes: 4 additions & 18 deletions apps/mobile/src/components/agents/repository-branch-selector.mounted.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,10 @@ vi.mock('react-native', async () => {
View: 'View',
Modal: 'Modal',
Pressable: 'Pressable',
// The real FlatList virtualizes; the fake renders every row so the picker's
// rows are assertable.
FlatList: ({
data,
renderItem,
keyExtractor,
}: {
data: string[];
renderItem: (info: { item: string }) => React.ReactNode;
keyExtractor: (item: string) => string;
}) =>
React.createElement(
'FlatList',
{},
...data.map(item =>
React.createElement('FlatListRow', { key: keyExtractor(item) }, renderItem({ item }))
)
),
// The real ScrollView scrolls; the fake renders every row so the
// picker's rows are assertable.
ScrollView: ({ children }: { children?: React.ReactNode }) =>
React.createElement('ScrollView', {}, children),
};
});
vi.mock('@/components/ui/text', async () => {
Expand Down
11 changes: 5 additions & 6 deletions apps/mobile/src/components/pr-review/diff/pr-diff-floating-actions.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,20 +286,19 @@ describe('PrDiffFloatingActions provider routes (s6)', () => {
pressButtonWith(GITLAB_REF, 'Comment on selected lines');

expect(routerPush).toHaveBeenCalledTimes(1);
expect(routerPush).toHaveBeenCalledWith({
pathname: '/(app)/pr-review/gitlab/group/sub/repo/12/comment-composer',
params: { path: 'src/lib.ts', side: 'RIGHT', line: 5, startLine: 3 },
});
expect(routerPush).toHaveBeenCalledWith(
'/(app)/pr-review/gitlab/group/sub/repo/12/comment-composer?path=src%2Flib.ts&side=RIGHT&line=5&startLine=3'
);
});

it.each<[ProviderPrRef, string]>([
[GITLAB_REF, '/(app)/pr-review/gitlab/group/sub/repo/12/review-submit'],
[BITBUCKET_REF, '/(app)/pr-review/bitbucket/acme/api/42/review-submit'],
])('pushes the review-submit sheet inside the %s ref route', (prRef, expectedPathname) => {
])('pushes the review-submit sheet inside the %s ref route', (prRef, expectedHref) => {
pressButtonWith(prRef, 'Finish review');

expect(routerPush).toHaveBeenCalledTimes(1);
expect(routerPush).toHaveBeenCalledWith({ pathname: expectedPathname, params: {} });
expect(routerPush).toHaveBeenCalledWith(expectedHref);
});
});

Expand Down
14 changes: 6 additions & 8 deletions apps/mobile/src/components/pr-review/merge/pr-merge-section-provider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,9 @@ describe('PrMergeSectionProvider (s6)', () => {
act(() => {
findButton(renderer, 'Merge merge request')?.();
});
expect(routerPush).toHaveBeenCalledWith({
pathname: '/(app)/pr-review/gitlab/group/sub/repo/12/merge',
params: { mode: 'merge' },
});
expect(routerPush).toHaveBeenCalledWith(
'/(app)/pr-review/gitlab/group/sub/repo/12/merge?mode=merge'
);
renderer.unmount();
});

Expand All @@ -141,10 +140,9 @@ describe('PrMergeSectionProvider (s6)', () => {
act(() => {
findButton(renderer, 'Enable auto-merge')?.();
});
expect(routerPush).toHaveBeenCalledWith({
pathname: '/(app)/pr-review/gitlab/group/sub/repo/12/merge',
params: { mode: 'enable-auto-merge' },
});
expect(routerPush).toHaveBeenCalledWith(
'/(app)/pr-review/gitlab/group/sub/repo/12/merge?mode=enable-auto-merge'
);
renderer.unmount();
});

Expand Down
Loading