1 files changed, 20 insertions, 6 deletions
diff --git a/packages/create-astro/test/utils.js b/packages/create-astro/test/utils.js
index b085ef083..9be444b5b 100644
--- a/packages/create-astro/test/utils.js
+++ b/packages/create-astro/test/utils.js
@@ -1,31 +1,45 @@
 import { execa } from 'execa';
-import { fileURLToPath } from 'url';
 import { dirname } from 'path';
+import stripAnsi from 'strip-ansi';
+import { fileURLToPath } from 'url';
 
 const __filename = fileURLToPath(import.meta.url);
 export const testDir = dirname(__filename);
 export const timeout = 5000;
 
-const createAstroError = new Error(
-	'Timed out waiting for create-astro to respond with expected output.'
-);
+const timeoutError = function (details) {
+	let errorMsg =
+	  'Timed out waiting for create-astro to respond with expected output.';
+	if (details) {
+		errorMsg += '\nLast output: "' + details + '"';
+	}
+	return new Error(errorMsg);
+}
 
 export function promiseWithTimeout(testFn) {
 	return new Promise((resolve, reject) => {
+		let lastStdout;
+		function onStdout (chunk) {
+			lastStdout = stripAnsi(chunk.toString()).trim() || lastStdout;
+		}
+
 		const timeoutEvent = setTimeout(() => {
-			reject(createAstroError);
+			reject(timeoutError(lastStdout));
 		}, timeout);
 		function resolver() {
 			clearTimeout(timeoutEvent);
 			resolve();
 		}
-		testFn(resolver);
+		
+		testFn(resolver, onStdout);
 	});
 }
 
 export const PROMPT_MESSAGES = {
 	directory: 'Where would you like to create your new project?',
 	template: 'Which template would you like to use?',
+	typescript: 'How would you like to setup TypeScript?',
+	typescriptSucceed: 'Next steps'
 };
 
 export function setup(args = []) {