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

refactor: Remove Setup.

Browse Source
This commit is contained in:
Ruben Verborgh
2020-12-07 22:42:03 +01:00
committed by Joachim Van Herwegen
parent 04a91858c2
commit badbe0032b
12 changed files with 27 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,19 +1,19 @@
import * as path from 'path';
import { Loader } from 'componentsjs';
import { runCli } from '../../../src/init/CliRunner';
import type { Setup } from '../../../src/init/Setup';
import type { Initializer } from '../../../src/init/Initializer';
const mainModulePath = path.join(__dirname, '../../../');
const mockSetup: jest.Mocked<Setup> = {
setup: jest.fn(async(): Promise<any> => null),
} as any;
const loader: jest.Mocked<Loader> = {
instantiateFromUrl: jest.fn(async(): Promise<any> => mockSetup),
registerAvailableModuleResources: jest.fn(async(): Promise<any> => mockSetup),
const initializer: jest.Mocked<Initializer> = {
handleSafe: jest.fn(),
} as any;
const loader: jest.Mocked<Loader> = {
instantiateFromUrl: jest.fn(async(): Promise<any> => initializer),
registerAvailableModuleResources: jest.fn(),
} as any;
// Mock the Loader class.
jest.mock('componentsjs', (): any => ({
// eslint-disable-next-line @typescript-eslint/naming-convention
Loader: jest.fn((): Loader => loader),
@@ -28,13 +28,13 @@ describe('CliRunner', (): void => {
runCli({
argv: [ 'node', 'script' ],
});
await mockSetup.setup();
await initializer.handleSafe();
expect(Loader).toHaveBeenCalledTimes(1);
expect(Loader).toHaveBeenCalledWith({ mainModulePath });
expect(loader.instantiateFromUrl).toHaveBeenCalledTimes(1);
expect(loader.instantiateFromUrl).toHaveBeenCalledWith(
'urn:solid-server:default',
'urn:solid-server:default:Initializer',
path.join(__dirname, '/../../../config/config-default.json'),
undefined,
{
@@ -50,8 +50,8 @@ describe('CliRunner', (): void => {
);
expect(loader.registerAvailableModuleResources).toHaveBeenCalledTimes(1);
expect(loader.registerAvailableModuleResources).toHaveBeenCalledWith();
expect(mockSetup.setup).toHaveBeenCalledTimes(1);
expect(mockSetup.setup).toHaveBeenCalledWith();
expect(initializer.handleSafe).toHaveBeenCalledTimes(1);
expect(initializer.handleSafe).toHaveBeenCalledWith();
});
it('accepts abbreviated flags.', async(): Promise<void> => {
@@ -67,10 +67,10 @@ describe('CliRunner', (): void => {
'-t', 'templates',
],
});
await mockSetup.setup();
await initializer.handleSafe();
expect(loader.instantiateFromUrl).toHaveBeenCalledWith(
'urn:solid-server:default',
'urn:solid-server:default:Initializer',
path.join(process.cwd(), 'myconfig.json'),
undefined,
{
@@ -99,10 +99,10 @@ describe('CliRunner', (): void => {
'--podTemplateFolder', 'templates',
],
});
await mockSetup.setup();
await initializer.handleSafe();
expect(loader.instantiateFromUrl).toHaveBeenCalledWith(
'urn:solid-server:default',
'urn:solid-server:default:Initializer',
path.join(process.cwd(), 'myconfig.json'),
undefined,
{

17
test/unit/init/Setup.test.ts
View File

@@ -1,17 +0,0 @@
import type { Initializer } from '../../../src/init/Initializer';
import { Setup } from '../../../src/init/Setup';
describe('Setup', (): void => {
const initializer: jest.Mocked<Initializer> = {
handleSafe: jest.fn(),
} as any;
beforeAll(async(): Promise<void> => {
const setup = new Setup(initializer);
await setup.setup();
});
it('calls the initializer.', async(): Promise<void> => {
expect(initializer.handleSafe).toHaveBeenCalledTimes(1);
});
});