Merge branch 'main' into versions/5.0.0

# Conflicts:
#	RELEASE_NOTES.md
#	config/quota-file.json

test/unit/http/UnsecureWebSocketsProtocol.test.ts

@@ -25,7 +25,7 @@ describe('An UnsecureWebSocketsProtocol', (): void => {
           'sec-websocket-protocol': 'solid-0.1, other/1.0.0',
         },
         socket: {
-          secure: true,
+          encrypted: true,
         },
       } as any as HttpRequest;
       await protocol.handle({ webSocket, upgradeRequest } as any);
@@ -101,7 +101,7 @@ describe('An UnsecureWebSocketsProtocol', (): void => {
       it('send an error message.', (): void => {
         expect(webSocket.messages).toHaveLength(1);
         expect(webSocket.messages.shift())
-          .toBe('error Mismatched host: wrong.example instead of mypod.example');
+          .toBe('error Mismatched host: expected mypod.example but got wrong.example');
       });
     });
 
@@ -113,7 +113,7 @@ describe('An UnsecureWebSocketsProtocol', (): void => {
       it('send an error message.', (): void => {
         expect(webSocket.messages).toHaveLength(1);
         expect(webSocket.messages.shift())
-          .toBe('error Mismatched protocol: http: instead of https:');
+          .toBe('error Mismatched protocol: expected https: but got http:');
       });
     });
   });

test/unit/storage/conversion/RdfToQuadConverter.test.ts

@@ -18,12 +18,17 @@ describe('A RdfToQuadConverter', (): void => {
   const identifier: ResourceIdentifier = { path: 'path' };
 
   it('supports serializing as quads.', async(): Promise<void> => {
-    const types = await rdfParser.getContentTypes();
-    for (const type of types) {
+    const types = rdfParser.getContentTypes()
+      .then((inputTypes): string[] => inputTypes.filter((type): boolean => type !== 'application/json'));
+    for (const type of await types) {
       await expect(converter.getOutputTypes(type)).resolves.toEqual({ [INTERNAL_QUADS]: 1 });
     }
   });
 
+  it('may not handle application/json to quad conversion.', async(): Promise<void> => {
+    await expect(converter.getOutputTypes('application/json')).resolves.toEqual({ });
+  });
+
   it('can handle turtle to quad conversions.', async(): Promise<void> => {
     const metadata = new RepresentationMetadata('text/turtle');
     const representation = { metadata } as Representation;