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

feat: Implement --baseUrl flag.

Browse Source 
Closes https://github.com/solid/community-server/issues/372
This commit is contained in:
Ruben Verborgh
2020-12-01 15:52:44 +01:00
parent 528688bc4c
commit eabe6bc4ed
13 changed files with 60 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/unit/init/CliRunner.test.ts
View File

@@ -5,13 +5,13 @@ import type { Setup } from '../../../src/init/Setup';
const mainModulePath = path.join(__dirname, '../../../');
const mockSetup = {
const mockSetup: jest.Mocked<Setup> = {
setup: jest.fn(async(): Promise<any> => null),
} as unknown as jest.Mocked<Setup>;
const loader = {
} as any;
const loader: jest.Mocked<Loader> = {
instantiateFromUrl: jest.fn(async(): Promise<any> => mockSetup),
registerAvailableModuleResources: jest.fn(async(): Promise<any> => mockSetup),
} as unknown as jest.Mocked<Loader>;
} as any;
// Mock the Loader class.
jest.mock('componentsjs', (): any => ({
@@ -40,7 +40,7 @@ describe('CliRunner', (): void => {
{
variables: {
'urn:solid-server:default:variable:port': 3000,
'urn:solid-server:default:variable:base': `http://localhost:3000/`,
'urn:solid-server:default:variable:baseUrl': 'http://localhost:3000/',
'urn:solid-server:default:variable:rootFilePath': process.cwd(),
'urn:solid-server:default:variable:sparqlEndpoint': undefined,
'urn:solid-server:default:variable:loggingLevel': 'info',
@@ -58,6 +58,7 @@ describe('CliRunner', (): void => {
argv: [
'node', 'script',
'-p', '4000',
'-b', 'http://pod.example/',
'-c', 'myconfig.json',
'-f', '/root',
'-s', 'http://localhost:5000/sparql',
@@ -73,7 +74,7 @@ describe('CliRunner', (): void => {
{
variables: {
'urn:solid-server:default:variable:port': 4000,
'urn:solid-server:default:variable:base': `http://localhost:4000/`,
'urn:solid-server:default:variable:baseUrl': 'http://pod.example/',
'urn:solid-server:default:variable:rootFilePath': '/root',
'urn:solid-server:default:variable:sparqlEndpoint': 'http://localhost:5000/sparql',
'urn:solid-server:default:variable:loggingLevel': 'debug',
@@ -87,6 +88,7 @@ describe('CliRunner', (): void => {
argv: [
'node', 'script',
'--port', '4000',
'--baseUrl', 'http://pod.example/',
'--config', 'myconfig.json',
'--rootFilePath', '/root',
'--sparqlEndpoint', 'http://localhost:5000/sparql',
@@ -102,7 +104,7 @@ describe('CliRunner', (): void => {
{
variables: {
'urn:solid-server:default:variable:port': 4000,
'urn:solid-server:default:variable:base': `http://localhost:4000/`,
'urn:solid-server:default:variable:baseUrl': 'http://pod.example/',
'urn:solid-server:default:variable:rootFilePath': '/root',
'urn:solid-server:default:variable:sparqlEndpoint': 'http://localhost:5000/sparql',
'urn:solid-server:default:variable:loggingLevel': 'debug',

29
test/unit/server/middleware/WebSocketAdvertiser.test.ts
View File

@@ -2,36 +2,31 @@ import { createResponse } from 'node-mocks-http';
import { WebSocketAdvertiser } from '../../../../src/server/middleware/WebSocketAdvertiser';
describe('A WebSocketAdvertiser', (): void => {
it('writes a default HTTP WebSocket.', async(): Promise<void> => {
const writer = new WebSocketAdvertiser();
const response = createResponse();
await writer.handle({ response } as any);
expect(response.getHeaders()).toEqual({ 'updates-via': 'ws://localhost/' });
});
it('writes an HTTP WebSocket with port 80.', async(): Promise<void> => {
const writer = new WebSocketAdvertiser({ hostname: 'test.example', port: 80, protocol: 'http' });
it('writes a ws: socket when given an http: URL.', async(): Promise<void> => {
const writer = new WebSocketAdvertiser('http://test.example/');
const response = createResponse();
await writer.handle({ response } as any);
expect(response.getHeaders()).toEqual({ 'updates-via': 'ws://test.example/' });
});
it('writes an HTTP WebSocket with port 3000.', async(): Promise<void> => {
const writer = new WebSocketAdvertiser({ hostname: 'test.example', port: 3000, protocol: 'http' });
it('writes a ws: socket when given a ws: URL.', async(): Promise<void> => {
const writer = new WebSocketAdvertiser('ws://test.example/');
const response = createResponse();
await writer.handle({ response } as any);
expect(response.getHeaders()).toEqual({ 'updates-via': 'ws://test.example:3000/' });
expect(response.getHeaders()).toEqual({ 'updates-via': 'ws://test.example/' });
});
it('writes an HTTPS WebSocket with port 443.', async(): Promise<void> => {
const writer = new WebSocketAdvertiser({ hostname: 'test.example', port: 443, protocol: 'https' });
it('writes a wss: socket when given an https: URL.', async(): Promise<void> => {
const writer = new WebSocketAdvertiser('https://test.example/');
const response = createResponse();
await writer.handle({ response } as any);
expect(response.getHeaders()).toEqual({ 'updates-via': 'wss://test.example/' });
});
it('rejects an invalid hostname.', (): void => {
expect((): any => new WebSocketAdvertiser({ hostname: 'test.example/invalid' }))
.toThrow('Invalid hostname: test.example/invalid');
it('writes a wss: socket when given a wss: URL.', async(): Promise<void> => {
const writer = new WebSocketAdvertiser('wss://test.example/');
const response = createResponse();
await writer.handle({ response } as any);
expect(response.getHeaders()).toEqual({ 'updates-via': 'wss://test.example/' });
});
});