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
9 changes: 6 additions & 3 deletions src/groups/suites.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import type { TestRailCtx } from '../TestRailCtx';
import { pagination } from '../internal/pagination';
import { _api } from '../internal/request';
import type { AddSuite, Suite, UpdateSuite } from '../payload';
import type { AddSuite, Pagination, Suite, UpdateSuite } from '../payload';

export function getSuite(ctx: TestRailCtx, suiteId: number): Promise<Suite> {
return _api(ctx, 'GET', `get_suite/${suiteId}`);
}

export function getSuites(ctx: TestRailCtx, projectId: number): Promise<Suite[]> {
return _api(ctx, 'GET', `get_suites/${projectId}`);
export function getSuites(ctx: TestRailCtx, projectId: number, filters?: Pagination): Promise<Suite[]> {
return pagination('suites', filters, (filters) => {
return _api(ctx, 'GET', `get_suites/${projectId}`, { query: filters });
});
}

export function addSuite(ctx: TestRailCtx, projectId: number, payload: AddSuite): Promise<Suite> {
Expand Down
5 changes: 4 additions & 1 deletion src/groups/users.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { TestRailCtx } from '../TestRailCtx';
import { pagination } from '../internal/pagination';
import { _api } from '../internal/request';
import type { AddUser, User, UserFilters } from '../payload';

Expand All @@ -15,7 +16,9 @@ export function getUserByEmail(ctx: TestRailCtx, email: string): Promise<User> {
}

export function getUsers(ctx: TestRailCtx, filters?: UserFilters): Promise<User[]> {
return _api(ctx, 'GET', 'get_users', { query: filters });
return pagination('users', filters, (filters) => {
return _api(ctx, 'GET', 'get_users', { query: filters });
});
}

export function addUser(ctx: TestRailCtx, payload: AddUser): Promise<User> {
Expand Down
4 changes: 3 additions & 1 deletion src/payload/request/UserFilters.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export interface UserFilters extends Record<string, unknown> {
import type { Pagination } from "./Pagination";

export interface UserFilters extends Pagination, Record<string, unknown> {
project_id?: number;
}
2 changes: 1 addition & 1 deletion test/suites.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Suites', () => {
});

it('get suites', async () => {
on(`get_suites/${projectId}`)
on(`get_suites/${projectId}&limit=250&offset=0`)
.reply(OK, suites);

await api
Expand Down
4 changes: 2 additions & 2 deletions test/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('Users', () => {
});

it('get users', async () => {
on('get_users')
on('get_users&limit=250&offset=0')
.reply(OK, users);

await api
Expand All @@ -47,7 +47,7 @@ describe('Users', () => {
});

it('get filtered users', async () => {
on(`get_users&${qs(userFilters)}`)
on(`get_users&${qs(userFilters)}&limit=250&offset=0`)
.reply(OK, users);

await api
Expand Down