Trez/opencommit-gitea
4
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: enable git push functionality in e2e tests

Browse Source 
- Added OCO_GITPUSH='true' environment variable to all e2e test commands
- Fixed ESM module import issues in commitlint tests by using process.cwd()
- Replaced import.meta.url usage with relative paths from project root
- All e2e tests now properly test the git push prompt functionality
This commit is contained in:
Tiger Kaovilai
2025-05-29 12:05:28 -05:00
parent aad62d4fa1
commit 3b868ce6df
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/gitPush.test.ts
+3 -3
View File
@@ -125,7 +125,7 @@ describe('cli flow to push git branch', () => {
await render('git', ['add index.ts'], { cwd: gitDir }); await render('git', ['add index.ts'], { cwd: gitDir });
const { queryByText, findByText, userEvent } = await render( const { queryByText, findByText, userEvent } = await render(
`OCO_AI_PROVIDER='test' node`, `OCO_AI_PROVIDER='test' OCO_GITPUSH='true' node`,
[resolve('./out/cli.cjs')], [resolve('./out/cli.cjs')],
{ cwd: gitDir } { cwd: gitDir }
); );
@@ -158,7 +158,7 @@ describe('cli flow to push git branch', () => {
await render('git', ['add index.ts'], { cwd: gitDir }); await render('git', ['add index.ts'], { cwd: gitDir });
const { findByText, userEvent } = await render( const { findByText, userEvent } = await render(
`OCO_AI_PROVIDER='test' node`, `OCO_AI_PROVIDER='test' OCO_GITPUSH='true' node`,
[resolve('./out/cli.cjs')], [resolve('./out/cli.cjs')],
{ cwd: gitDir } { cwd: gitDir }
); );
@@ -186,7 +186,7 @@ describe('cli flow to push git branch', () => {
await render('git', ['add index.ts'], { cwd: gitDir }); await render('git', ['add index.ts'], { cwd: gitDir });
const { findByText, userEvent } = await render( const { findByText, userEvent } = await render(
`OCO_AI_PROVIDER='test' node`, `OCO_AI_PROVIDER='test' OCO_GITPUSH='true' node`,
[resolve('./out/cli.cjs')], [resolve('./out/cli.cjs')],
{ cwd: gitDir } { cwd: gitDir }
); );
test/e2e/oneFile.test.ts
+2 -2
View File
@@ -9,7 +9,7 @@ it('cli flow to generate commit message for 1 new file (staged)', async () => {
await render('echo' ,[`'console.log("Hello World");' > index.ts`], { cwd: gitDir }); await render('echo' ,[`'console.log("Hello World");' > index.ts`], { cwd: gitDir });
await render('git' ,['add index.ts'], { cwd: gitDir }); await render('git' ,['add index.ts'], { cwd: gitDir });
const { queryByText, findByText, userEvent } = await render(`OCO_AI_PROVIDER='test' node`, [resolve('./out/cli.cjs')], { cwd: gitDir }); const { queryByText, findByText, userEvent } = await render(`OCO_AI_PROVIDER='test' OCO_GITPUSH='true' node`, [resolve('./out/cli.cjs')], { cwd: gitDir });
expect(await queryByText('No files are staged')).not.toBeInTheConsole(); expect(await queryByText('No files are staged')).not.toBeInTheConsole();
expect(await queryByText('Do you want to stage all files and generate commit message?')).not.toBeInTheConsole(); expect(await queryByText('Do you want to stage all files and generate commit message?')).not.toBeInTheConsole();
@@ -34,7 +34,7 @@ it('cli flow to generate commit message for 1 changed file (not staged)', async
await render('echo' ,[`'console.log("Good night World");' >> index.ts`], { cwd: gitDir }); await render('echo' ,[`'console.log("Good night World");' >> index.ts`], { cwd: gitDir });
const { findByText, userEvent } = await render(`OCO_AI_PROVIDER='test' node`, [resolve('./out/cli.cjs')], { cwd: gitDir }); const { findByText, userEvent } = await render(`OCO_AI_PROVIDER='test' OCO_GITPUSH='true' node`, [resolve('./out/cli.cjs')], { cwd: gitDir });
expect(await findByText('No files are staged')).toBeInTheConsole(); expect(await findByText('No files are staged')).toBeInTheConsole();
expect(await findByText('Do you want to stage all files and generate commit message?')).toBeInTheConsole(); expect(await findByText('Do you want to stage all files and generate commit message?')).toBeInTheConsole();
test/e2e/prompt-module/commitlint.test.ts
+8 -8
View File
@@ -5,8 +5,8 @@ import { prepareEnvironment, wait } from '../utils';
import path from 'path'; import path from 'path';
function getAbsolutePath(relativePath: string) { function getAbsolutePath(relativePath: string) {
const scriptDir = path.dirname(__filename); // Use process.cwd() which should be the project root during test execution
return path.resolve(scriptDir, relativePath); return path.resolve(process.cwd(), 'test/e2e/prompt-module', relativePath);
} }
async function setupCommitlint(dir: string, ver: 9 | 18 | 19) { async function setupCommitlint(dir: string, ver: 9 | 18 | 19) {
let packagePath, packageJsonPath, configPath; let packagePath, packageJsonPath, configPath;
@@ -47,7 +47,7 @@ describe('cli flow to run "oco commitlint force"', () => {
` `
OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \ OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
OCO_PROMPT_MODULE='@commitlint' \ OCO_PROMPT_MODULE='@commitlint' \
OCO_AI_PROVIDER='test' \ OCO_AI_PROVIDER='test' OCO_GITPUSH='true' \
node ${resolve('./out/cli.cjs')} commitlint force \ node ${resolve('./out/cli.cjs')} commitlint force \
`, `,
[], [],
@@ -83,7 +83,7 @@ describe('cli flow to run "oco commitlint force"', () => {
` `
OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \ OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
OCO_PROMPT_MODULE='@commitlint' \ OCO_PROMPT_MODULE='@commitlint' \
OCO_AI_PROVIDER='test' \ OCO_AI_PROVIDER='test' OCO_GITPUSH='true' \
node ${resolve('./out/cli.cjs')} commitlint force \ node ${resolve('./out/cli.cjs')} commitlint force \
`, `,
[], [],
@@ -119,7 +119,7 @@ describe('cli flow to run "oco commitlint force"', () => {
` `
OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \ OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
OCO_PROMPT_MODULE='@commitlint' \ OCO_PROMPT_MODULE='@commitlint' \
OCO_AI_PROVIDER='test' \ OCO_AI_PROVIDER='test' OCO_GITPUSH='true' \
node ${resolve('./out/cli.cjs')} commitlint force \ node ${resolve('./out/cli.cjs')} commitlint force \
`, `,
[], [],
@@ -160,7 +160,7 @@ describe('cli flow to generate commit message using @commitlint prompt-module',
` `
OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \ OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
OCO_PROMPT_MODULE='@commitlint' \ OCO_PROMPT_MODULE='@commitlint' \
OCO_AI_PROVIDER='test' \ OCO_AI_PROVIDER='test' OCO_GITPUSH='true' \
node ${resolve('./out/cli.cjs')} commitlint force \ node ${resolve('./out/cli.cjs')} commitlint force \
`, `,
[], [],
@@ -175,7 +175,7 @@ describe('cli flow to generate commit message using @commitlint prompt-module',
` `
OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \ OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
OCO_PROMPT_MODULE='@commitlint' \ OCO_PROMPT_MODULE='@commitlint' \
OCO_AI_PROVIDER='test' \ OCO_AI_PROVIDER='test' OCO_GITPUSH='true' \
node ${resolve('./out/cli.cjs')} commitlint get \ node ${resolve('./out/cli.cjs')} commitlint get \
`, `,
[], [],
@@ -193,7 +193,7 @@ describe('cli flow to generate commit message using @commitlint prompt-module',
` `
OCO_TEST_MOCK_TYPE='commit-message' \ OCO_TEST_MOCK_TYPE='commit-message' \
OCO_PROMPT_MODULE='@commitlint' \ OCO_PROMPT_MODULE='@commitlint' \
OCO_AI_PROVIDER='test' \ OCO_AI_PROVIDER='test' OCO_GITPUSH='true' \
node ${resolve('./out/cli.cjs')} \ node ${resolve('./out/cli.cjs')} \
`, `,
[], [],