Merge remote-tracking branch 'origin/main' into next

1 files changed, 28 insertions, 19 deletions

diff --git a/packages/create-astro/test/git.test.js b/packages/create-astro/test/git.test.js
index c8fa86e86..d05ad5bdc 100644
--- a/packages/create-astro/test/git.test.js
+++ b/packages/create-astro/test/git.test.js
@@ -1,7 +1,6 @@
 import { expect } from 'chai';
-
-import { execa } from 'execa';
-import fs from 'node:fs';
+import { mkdir, writeFile } from 'node:fs/promises';
+import { rmSync } from 'node:fs';
 
 import { git } from '../dist/index.js';
 import { setup } from './utils.js';
@@ -16,22 +15,6 @@ describe('git', () => {
 		expect(fixture.hasMessage('Skipping Git initialization')).to.be.true;
 	});
 
-	it('already initialized', async () => {
-		const context = {
-			git: true,
-			cwd: './test/fixtures/not-empty',
-			dryRun: true,
-			prompt: () => ({ git: false }),
-		};
-		await execa('git', ['init'], { cwd: './test/fixtures/not-empty' });
-		await git(context);
-
-		expect(fixture.hasMessage('Git has already been initialized')).to.be.true;
-
-		// Cleanup
-		fs.rmSync('./test/fixtures/not-empty/.git', { recursive: true, force: true });
-	});
-
 	it('yes (--dry-run)', async () => {
 		const context = { cwd: '', dryRun: true, prompt: () => ({ git: true }) };
 		await git(context);
@@ -46,3 +29,29 @@ describe('git', () => {
 		expect(fixture.hasMessage('Skipping Git initialization')).to.be.true;
 	});
 });
+
+describe('git initialized', () => {
+	const fixture = setup();
+	const dir = new URL(new URL('./fixtures/not-empty/.git', import.meta.url));
+
+	before(async () => {
+		await mkdir(dir, { recursive: true });
+		await writeFile(new URL('./git.json', dir), '{}', { encoding: 'utf8' });
+	});
+
+	it('already initialized', async () => {
+		const context = {
+			git: true,
+			cwd: './test/fixtures/not-empty',
+			dryRun: false,
+			prompt: () => ({ git: false }),
+		};
+		await git(context);
+
+		expect(fixture.hasMessage('Git has already been initialized')).to.be.true;
+	});
+
+	after(() => {
+		rmSync(dir, { recursive: true, force: true });
+	});
+});