test: Make integration test names consistent.

This commit is contained in:
Ruben Verborgh 2020-12-22 00:32:38 +01:00
parent 8dcb498201
commit 9dcb4fb603
12 changed files with 13 additions and 13 deletions

View File

@ -17,7 +17,7 @@ export const instantiateFromConfig = async(componentUrl: string, configFile: str
await loader.registerAvailableModuleResources();
// Instantiate the component from the config
const configPath = Path.join(__dirname, configFile);
const configPath = Path.join(__dirname, 'config', configFile);
return loader.instantiateFromUrl(componentUrl, configPath, undefined, { variables });
};

View File

@ -35,7 +35,7 @@ describe.each(stores)('An LDP handler with auth using %s', (name, { storeUrn, se
};
const internalStore = await instantiateFromConfig(
storeUrn,
'auth-ldp-handler.json',
'ldp-with-auth.json',
variables,
) as ResourceStore;
variables['urn:solid-server:default:variable:store'] = internalStore;
@ -45,7 +45,7 @@ describe.each(stores)('An LDP handler with auth using %s', (name, { storeUrn, se
let store: ResourceStore;
const instances = await instantiateFromConfig(
'urn:solid-server:test:Instances',
'auth-ldp-handler.json',
'ldp-with-auth.json',
variables,
) as Record<string, any>;
({ handler, store, initializer } = instances);

View File

@ -30,7 +30,7 @@ describe.each(stores)('An LDP handler without auth using %s', (name, { storeUrn,
};
const internalStore = await instantiateFromConfig(
storeUrn,
'auth-ldp-handler.json',
'ldp-with-auth.json',
variables,
) as ResourceStore;
variables['urn:solid-server:default:variable:store'] = internalStore;
@ -39,7 +39,7 @@ describe.each(stores)('An LDP handler without auth using %s', (name, { storeUrn,
let initializer: Initializer;
const instances = await instantiateFromConfig(
'urn:solid-server:test:Instances',
'auth-ldp-handler.json',
'ldp-with-auth.json',
variables,
) as Record<string, any>;
({ handler, initializer } = instances);

View File

@ -13,7 +13,7 @@ describe('An integrated AuthenticatedLdpHandler', (): void => {
beforeAll(async(): Promise<void> => {
handler = await instantiateFromConfig(
'urn:solid-server:default:LdpHandler', 'auth-allow-all.json', {
'urn:solid-server:default:LdpHandler', 'server-without-auth.json', {
'urn:solid-server:default:variable:baseUrl': BASE,
},
) as HttpHandler;

View File

@ -21,7 +21,7 @@ describe('An Express server with middleware', (): void => {
beforeAll(async(): Promise<void> => {
const factory = await instantiateFromConfig(
'urn:solid-server:default:ExpressHttpServerFactory', 'middleware.json', {
'urn:solid-server:default:ExpressHttpServerFactory', 'server-middleware.json', {
'urn:solid-server:default:PodManagerHandler': new StaticAsyncHandler(false, null),
'urn:solid-server:default:LdpHandler': new SimpleHttpHandler(),
'urn:solid-server:default:variable:port': port,

View File

@ -14,7 +14,7 @@ describe('A server with a pod handler', (): void => {
beforeAll(async(): Promise<void> => {
const factory = await instantiateFromConfig(
'urn:solid-server:default:ServerFactory', 'auth-allow-all.json', {
'urn:solid-server:default:ServerFactory', 'server-without-auth.json', {
'urn:solid-server:default:variable:port': port,
'urn:solid-server:default:variable:baseUrl': baseUrl,
'urn:solid-server:default:variable:podTemplateFolder': join(__dirname, '../assets/templates'),

View File

@ -15,7 +15,7 @@ describe('A server with authorization', (): void => {
};
const internalStore = await instantiateFromConfig(
'urn:solid-server:default:MemoryResourceStore',
'auth-ldp-handler.json',
'ldp-with-auth.json',
variables,
) as ResourceStore;
variables['urn:solid-server:default:variable:store'] = internalStore;
@ -25,7 +25,7 @@ describe('A server with authorization', (): void => {
let store: ResourceStore;
const instances = await instantiateFromConfig(
'urn:solid-server:test:Instances',
'auth-ldp-handler.json',
'ldp-with-auth.json',
variables,
) as Record<string, any>;
({ handler, store, initializer } = instances);

View File

@ -14,7 +14,7 @@ describeIf('docker', 'A server with a SPARQL endpoint as storage', (): void => {
};
const internalStore = await instantiateFromConfig(
'urn:solid-server:default:SparqlResourceStore',
'auth-ldp-handler.json',
'ldp-with-auth.json',
variables,
) as ResourceStore;
variables['urn:solid-server:default:variable:store'] = internalStore;
@ -23,7 +23,7 @@ describeIf('docker', 'A server with a SPARQL endpoint as storage', (): void => {
let initializer: Initializer;
const instances = await instantiateFromConfig(
'urn:solid-server:test:Instances',
'auth-ldp-handler.json',
'ldp-with-auth.json',
variables,
) as Record<string, any>;
({ handler, initializer } = instances);

View File

@ -13,7 +13,7 @@ describe('A server with the Solid WebSockets API behind a proxy', (): void => {
beforeAll(async(): Promise<void> => {
const factory = await instantiateFromConfig(
'urn:solid-server:default:ServerFactory', 'auth-allow-all.json', {
'urn:solid-server:default:ServerFactory', 'server-without-auth.json', {
'urn:solid-server:default:variable:port': port,
'urn:solid-server:default:variable:baseUrl': 'https://example.pod/',
'urn:solid-server:default:variable:podTemplateFolder': 'templates',