Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

feat(ts/e2e): make E2ETestResultWithFiles generic over file keys

jkomyno060e25b266ec
diff --git a/ts/e2e-tests/_utils/src/runner.ts b/ts/e2e-tests/_utils/src/runner.ts
index e93f9af58..3a4452dbb 100644
--- a/ts/e2e-tests/_utils/src/runner.ts
+++ b/ts/e2e-tests/_utils/src/runner.ts
@@ -906,7 +906,7 @@ export function runE2E(config: RunE2EInternalConfig): void {
defineTests({
runtime: 'node',
- runCmd: (cmd) => executors.runCmd(cmd),
+ runCmd: ((cmd: RunCmdInput) => executors.runCmd(cmd)) as DefineTestsContext['runCmd'],
runFixture: ((opts: RunFixtureOptions) => executors.runFixture(opts)) as DefineTestsContext['runFixture'],
});
@@ -950,7 +950,7 @@ export function runE2E(config: RunE2EInternalConfig): void {
defineTests({
runtime: 'deno',
- runCmd: (cmd) => executors.runCmd(cmd),
+ runCmd: ((cmd: RunCmdInput) => executors.runCmd(cmd)) as DefineTestsContext['runCmd'],
runFixture: ((opts: RunFixtureOptions) => executors.runFixture(opts)) as DefineTestsContext['runFixture'],
});
@@ -994,7 +994,7 @@ export function runE2E(config: RunE2EInternalConfig): void {
defineTests({
runtime: 'cli',
- runCmd: (cmd) => executors.runCmd(cmd),
+ runCmd: ((cmd: RunCmdInput) => executors.runCmd(cmd)) as DefineTestsContext['runCmd'],
runFixture: ((opts: RunFixtureOptions) => executors.runFixture(opts)) as DefineTestsContext['runFixture'],
});
diff --git a/ts/e2e-tests/_utils/src/types.ts b/ts/e2e-tests/_utils/src/types.ts
index 16d04fd89..eb01ba1f4 100644
--- a/ts/e2e-tests/_utils/src/types.ts
+++ b/ts/e2e-tests/_utils/src/types.ts
@@ -80,9 +80,9 @@ export interface E2ETestResult {
/**
* Result of executing a command with requested file captures.
*/
-export interface E2ETestResultWithFiles extends E2ETestResult {
+export interface E2ETestResultWithFiles<F extends string = string> extends E2ETestResult {
/** Captured file contents keyed by requested file path */
- files: Record<string, string>;
+ files: { [K in F]: string };
}
/**
@@ -128,7 +128,7 @@ export interface DefineTestsContext {
/** Run an arbitrary command in the Docker container */
runCmd: {
<const C extends string>(command: NonEmptyString<C>): Promise<E2ETestResult>;
- <const C extends string>(options: { command: NonEmptyString<C>; files: NonEmptyArray<string> }): Promise<E2ETestResultWithFiles>;
+ <const C extends string, const F extends string>(options: { command: NonEmptyString<C>; files: NonEmptyArray<F> }): Promise<E2ETestResultWithFiles<F>>;
};
/**
* Run a fixture file with Node.js.
diff --git a/ts/e2e-tests/cli/version/e2e.test.ts b/ts/e2e-tests/cli/version/e2e.test.ts
index caf84598a..b2feb0232 100644
--- a/ts/e2e-tests/cli/version/e2e.test.ts
+++ b/ts/e2e-tests/cli/version/e2e.test.ts
@@ -16,7 +16,7 @@ e2e(import.meta.url, {
defineTests: ({ runCmd }) => {
const expectedVersion = String(cliPkg.version ?? '').trim();
let versionResult: E2ETestResult;
- let redirectedResult: E2ETestResultWithFiles;
+ let redirectedResult: E2ETestResultWithFiles<'out.txt'>;
beforeAll(async () => {
versionResult = await runCmd('composio version');
@@ -36,7 +36,7 @@ e2e(import.meta.url, {
});
it('stderr matches snapshot', () => {
- expect(sanitizeOutput(versionResult.stderr)).toBe('');
+ expect(versionResult.stderr).toBe('');
});
});
@@ -46,15 +46,15 @@ e2e(import.meta.url, {
});
it('stdout is empty', () => {
- expect(sanitizeOutput(redirectedResult.stdout)).toBe('');
+ expect(redirectedResult.stdout).toBe('');
});
it('stderr is empty', () => {
- expect(sanitizeOutput(redirectedResult.stderr)).toBe('');
+ expect(redirectedResult.stderr).toBe('');
});
it('out.txt matches snapshot', () => {
- expect(sanitizeOutput(redirectedResult.files['out.txt'] ?? '')).toBe(expectedVersion);
+ expect(sanitizeOutput(redirectedResult.files['out.txt'])).toBe(expectedVersion);
});
});
},