Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Resolve duplicate error message and no trailing newline

Browse Source 
* fix: Resolves duplicate error message

* test: Add trailing newline on error test
This commit is contained in:
smessie 2020-10-27 15:17:59 +01:00 committed by GitHub
parent 99464d9a95
commit a7fa61ab2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ldp/http/BasicResponseWriter.ts
View File

@ -27,7 +27,9 @@ export class BasicResponseWriter extends ResponseWriter {
} }
input.response.setHeader('content-type', 'text/plain'); input.response.setHeader('content-type', 'text/plain');
input.response.writeHead(code); input.response.writeHead(code);
input.response.end(`${input.result.name}: ${input.result.message}\n${input.result.stack}`); input.response.end(typeof input.result.stack === 'string' ?
`${input.result.stack}\n` :
`${input.result.name}: ${input.result.message}\n`);
} else { } else {
input.response.setHeader('location', input.result.identifier.path); input.response.setHeader('location', input.result.identifier.path);
if (input.result.body) { if (input.result.body) {

15
test/unit/ldp/http/BasicResponseWriter.test.ts
View File

@ -81,4 +81,19 @@ describe('A BasicResponseWriter', (): void => {
expect(response._getStatusCode()).toBe(error.statusCode); expect(response._getStatusCode()).toBe(error.statusCode);
expect(response._getData()).toMatch('UnsupportedHttpError: error'); expect(response._getData()).toMatch('UnsupportedHttpError: error');
}); });
it('responds with the error name and message when no stack trace is lazily generated.', async(): Promise<void> => {
const error = new Error('error');
error.stack = undefined;
await writer.handle({ response, result: error });
expect(response._isEndCalled()).toBeTruthy();
expect(response._getStatusCode()).toBe(500);
expect(response._getData()).toMatch('Error: error');
});
it('ends its response with a newline if there is an error.', async(): Promise<void> => {
await writer.handle({ response, result: new Error('error') });
expect(response._isEndCalled()).toBeTruthy();
expect(response._getData().endsWith('\n')).toBeTruthy();
});
}); });