From a9ca41419e190755c024b5492f1ead961a964b7e Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Wed, 14 Sep 2022 09:35:51 -0400
Subject: [PATCH] await the result of handleRoute

---
 .../src/vite-plugin-astro-server/index.ts     |   6 +-
 packages/astro/test/api-routes.test.js        |  98 ++++++------------
 .../api-routes/src/images/penguin.jpg         | Bin 4430 -> 0 bytes
 .../fixtures/api-routes/src/pages/binary.js   |  32 ------
 .../fixtures/api-routes/src/pages/index.astro |  19 ----
 5 files changed, 34 insertions(+), 121 deletions(-)
 delete mode 100644 packages/astro/test/fixtures/api-routes/src/images/penguin.jpg
 delete mode 100644 packages/astro/test/fixtures/api-routes/src/pages/binary.js
 delete mode 100644 packages/astro/test/fixtures/api-routes/src/pages/index.astro

diff --git a/packages/astro/src/vite-plugin-astro-server/index.ts b/packages/astro/src/vite-plugin-astro-server/index.ts
index 845b5f6f81fd..a1448d553837 100644
--- a/packages/astro/src/vite-plugin-astro-server/index.ts
+++ b/packages/astro/src/vite-plugin-astro-server/index.ts
@@ -293,7 +293,7 @@ async function handleRequest(
 		);
 		filePath = matchedRoute?.filePath;
 	
-		return handleRoute(
+		return await handleRoute(
 			matchedRoute,
 			url,
 			pathname,
@@ -306,7 +306,7 @@ async function handleRequest(
 			config,
 			req,
 			res
-		)
+		);
 	} catch(_err) {
 		const err = fixViteErrorMessage(_err, viteServer, filePath);
 		const errorWithMetadata = collectErrorMetadata(err);
@@ -329,8 +329,6 @@ async function handleRoute(
 	req: http.IncomingMessage,
 	res: http.ServerResponse
 ): Promise<void> {
-	
-
 	if (!matchedRoute) {
 		return handle404Response(origin, config, req, res);
 	}
diff --git a/packages/astro/test/api-routes.test.js b/packages/astro/test/api-routes.test.js
index 9a3024c70426..a911de3327b5 100644
--- a/packages/astro/test/api-routes.test.js
+++ b/packages/astro/test/api-routes.test.js
@@ -1,81 +1,47 @@
 import { expect } from 'chai';
+import * as cheerio from 'cheerio';
 import { loadFixture } from './test-utils.js';
 import * as fs from 'fs';
-
-import { FormData, File } from 'node-fetch'
+import { FormData, File } from 'node-fetch';
 
 describe('API routes', () => {
-	describe('Development - SSR', () => {
-		/** @type {import('./test-utils').Fixture} */
-		let fixture;
-		/** @type {import('./test-utils').DevServer} */
-		let devServer;
-		before(async () => {
-			fixture = await loadFixture({
-				output: 'server',
-				root: './fixtures/api-routes/'
-			});
-			devServer = await fixture.startDevServer();
-		});
-
-		after(async () => {
-			await devServer.stop();
-		});
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
 
-		it('Can be passed binary data from multipart formdata', async () => {
-			const formData  = new FormData();
-			const raw = await fs.promises.readFile(new URL('./fixtures/api-routes/src/images/penguin.jpg', import.meta.url));
-			const file = new File([raw], 'penguin.jpg', { type: 'text/jpg' });
-			formData.set('file', file, 'penguin.jpg');
+	before(async () => {
+		fixture = await loadFixture({ root: './fixtures/api-routes/' });
+		await fixture.build();
+	});
 
-			const res = await fixture.fetch('/binary', {
-				method: 'POST',
-				body: formData
+	describe('Deprecated API', () => {
+		it('two argument supported', async () => {
+			const one = JSON.parse(await fixture.readFile('/old-api/twoarg/one.json'));
+			expect(one).to.deep.equal({
+				param: 'one',
+				pathname: '/old-api/twoarg/one.json',
+			});
+			const two = JSON.parse(await fixture.readFile('/old-api/twoarg/two.json'));
+			expect(two).to.deep.equal({
+				param: 'two',
+				pathname: '/old-api/twoarg/two.json',
 			});
-
-			expect(res.status).to.equal(200);
 		});
-	});
-
-	describe('Build - SSG', () => {
-		/** @type {import('./test-utils').Fixture} */
-		let fixture;
 
-		before(async () => {
-			fixture = await loadFixture({ root: './fixtures/api-routes/' });
-			await fixture.build();
-		});
-	
-		describe('Deprecated API', () => {
-			it('two argument supported', async () => {
-				const one = JSON.parse(await fixture.readFile('/old-api/twoarg/one.json'));
-				expect(one).to.deep.equal({
-					param: 'one',
-					pathname: '/old-api/twoarg/one.json',
-				});
-				const two = JSON.parse(await fixture.readFile('/old-api/twoarg/two.json'));
-				expect(two).to.deep.equal({
-					param: 'two',
-					pathname: '/old-api/twoarg/two.json',
-				});
-			});
-	
-			it('param first argument is supported', async () => {
-				const one = JSON.parse(await fixture.readFile('/old-api/onearg/one.json'));
-				expect(one).to.deep.equal({
-					param: 'one',
-				});
+		it('param first argument is supported', async () => {
+			const one = JSON.parse(await fixture.readFile('/old-api/onearg/one.json'));
+			expect(one).to.deep.equal({
+				param: 'one',
 			});
 		});
-	
-		describe('1.0 API', () => {
-			it('Receives a context argument', async () => {
-				const one = JSON.parse(await fixture.readFile('/context/data/one.json'));
-				expect(one).to.deep.equal({
-					param: 'one',
-					pathname: '/context/data/one.json',
-				});
+	});
+
+	describe('1.0 API', () => {
+		it('Receives a context argument', async () => {
+			const one = JSON.parse(await fixture.readFile('/context/data/one.json'));
+			expect(one).to.deep.equal({
+				param: 'one',
+				pathname: '/context/data/one.json',
 			});
 		});
-	})
+	});
 });
diff --git a/packages/astro/test/fixtures/api-routes/src/images/penguin.jpg b/packages/astro/test/fixtures/api-routes/src/images/penguin.jpg
deleted file mode 100644
index 89548d9261f98392bd1c04a815e7cf74c2517327..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4430
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

diff --git a/packages/astro/test/fixtures/api-routes/src/pages/binary.js b/packages/astro/test/fixtures/api-routes/src/pages/binary.js
deleted file mode 100644
index 3e1c70c81502..000000000000
--- a/packages/astro/test/fixtures/api-routes/src/pages/binary.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import fs from 'node:fs';
-
-export function get() {
-	return {
-		body: 'ok'
-	};
-}
-
-export async function post({ request }) {
-	const data = await request.formData();
-	const file = data.get('file');
-
-	if (file) {
-		const buffer = await file.arrayBuffer();
-		const realBuffer = await fs.promises.readFile(new URL('../images/penguin.jpg', import.meta.url));
-
-		if(buffersEqual(buffer, realBuffer)) {
-			return new Response('ok', { status: 200 });
-		}	
-	}
-	return new Response(null, { status: 400 });
-}
-
-function buffersEqual(buf1, buf2) {
-	if (buf1.byteLength != buf2.byteLength) return false;
-	const dv1 = new Uint8Array(buf1);
-	const dv2 = new Uint8Array(buf2);
-	for (let i = 0; i !== buf1.byteLength; i++) {
-		if (dv1[i] != dv2[i]) return false;
-	}
-	return true;
-}
diff --git a/packages/astro/test/fixtures/api-routes/src/pages/index.astro b/packages/astro/test/fixtures/api-routes/src/pages/index.astro
deleted file mode 100644
index 3e7b31c2c82a..000000000000
--- a/packages/astro/test/fixtures/api-routes/src/pages/index.astro
+++ /dev/null
@@ -1,19 +0,0 @@
----
----
-
-<html lang="en">
-	<head>
-		<meta charset="utf-8" />
-		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-		<meta name="viewport" content="width=device-width" />
-		<meta name="generator" content={Astro.generator} />
-		<title>Astro</title>
-	</head>
-	<body>
-		<form action="/binary" enctype="multipart/form-data" method="post">
-			<label for="file">Upload File</label>
-			<input type="file" id="file" name="file" />
-			<button type="submit">Submit</button>
-		</form>
-	</body>
-</html>