add more tests, remove src changes

Author: Rich-Harris

packages/kit/src/runtime/server/page/respond.js

@@ -125,8 +125,6 @@ export async function respond(opts) {
 
 					if (loaded.loaded.error) {
 						({ status, error } = loaded.loaded);
-						const e = coalesce_to_error(error);
-						options.handle_error(e, event);
 					}
 				} catch (err) {
 					const e = coalesce_to_error(err);

packages/kit/test/apps/basics/src/routes/errors/endpoint-not-ok.json.js

@@ -0,0 +1,6 @@
+/** @type {import('@sveltejs/kit').RequestHandler} */
+export function get() {
+	return {
+		status: 555
+	};
+}

packages/kit/test/apps/basics/src/routes/errors/endpoint-not-ok.svelte

@@ -0,0 +1,18 @@
+<script context="module">
+	/** @type {import('@sveltejs/kit').Load} */
+	export async function load({ fetch }) {
+		const res = await fetch('/errors/endpoint-not-ok.json');
+		if (res.ok) {
+			return {
+				props: await res.json()
+			};
+		} else {
+			return {
+				status: res.status,
+				error: new Error(res.statusText)
+			};
+		}
+	}
+</script>
+
+<h1>this text should not appear</h1>

packages/kit/test/apps/basics/src/routes/errors/endpoint-shadow-not-ok.js

@@ -0,0 +1,6 @@
+/** @type {import('@sveltejs/kit').RequestHandler} */
+export function get() {
+	return {
+		status: 555
+	};
+}

packages/kit/test/apps/basics/src/routes/errors/endpoint-shadow-not-ok.svelte

@@ -0,0 +1,2 @@
+
+<h1>this text should not appear</h1>

packages/kit/test/apps/basics/src/routes/errors/endpoint-shadow.js

@@ -1,4 +1,4 @@
 /** @type {import('@sveltejs/kit').RequestHandler} */
 export function get() {
-	throw new Error('nope shadow');
+	throw new Error('nope');
 }

packages/kit/test/apps/basics/test/test.js

@@ -764,6 +764,24 @@ test.describe.parallel('Errors', () => {
 		}
 	});
 
+	test('not ok response from endpoint', async ({ page, read_errors }) => {
+		const res = await page.goto('/errors/endpoint-not-ok');
+
+		expect(read_errors('/errors/endpoint-not-ok.json')).toBeUndefined();
+
+		expect(res && res.status()).toBe(555);
+		expect(await page.textContent('#message')).toBe('This is your custom error page saying: ""');
+
+		const contents = await page.textContent('#stack');
+		const location = 'endpoint-not-ok.svelte:12:15';
+
+		if (process.env.DEV) {
+			expect(contents).toMatch(location);
+		} else {
+			expect(contents).not.toMatch(location);
+		}
+	});
+
 	test('error in shadow endpoint', async ({ page, read_errors }) => {
 		const res = await page.goto('/errors/endpoint-shadow');
 
@@ -776,10 +794,12 @@ test.describe.parallel('Errors', () => {
 		}
 
 		expect(res && res.status()).toBe(500);
-		expect(await page.textContent('#message')).toBe('This is your custom error page saying: ""');
+		expect(await page.textContent('#message')).toBe(
+			'This is your custom error page saying: "nope"'
+		);
 
 		const contents = await page.textContent('#stack');
-		const location = 'endpoint.svelte:12:15';
+		const location = 'endpoint-shadow.js:1:8'; // TODO this is the wrong location, but i'm not going to open the sourcemap can of worms just now
 
 		if (process.env.DEV) {
 			expect(contents).toMatch(location);
@@ -788,6 +808,17 @@ test.describe.parallel('Errors', () => {
 		}
 	});
 
+	test('not ok response from shadow endpoint', async ({ page, read_errors }) => {
+		const res = await page.goto('/errors/endpoint-shadow-not-ok');
+
+		expect(read_errors('/errors/endpoint-shadow-not-ok')).toBeUndefined();
+
+		expect(res && res.status()).toBe(555);
+		expect(await page.textContent('#message')).toBe(
+			'This is your custom error page saying: "Failed to load data"'
+		);
+	});
+
 	test('server-side 4xx status without error from load()', async ({ page }) => {
 		const response = await page.goto('/errors/load-status-without-error-server');