Merge branch 'main' into versions/5.0.0

# Conflicts:
#	RELEASE_NOTES.md
#	config/quota-file.json
This commit is contained in:
Joachim Van Herwegen
2022-07-04 13:53:17 +02:00
26 changed files with 193 additions and 35 deletions

View File

@@ -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:');
});
});
});