Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monux-cli",
"version": "2.0.7",
"version": "2.0.8",
"license": "MIT",
"main": "index.js",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/add/add-angular/add-angular.command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export class AddAngularCommand extends AddCommand<AddAngularConfiguration> {
volumes: [{ path: `/${config.name}` }]
// labels: DockerUtilities.getTraefikLabels(config.name, 4000, domain)
},
config.port,
4000,
true,
config.subDomain
),
Expand Down
2 changes: 1 addition & 1 deletion src/commands/add/add-loopback/add-loopback.command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class AddLoopbackCommand extends AddCommand<AddLoopbackConfiguration> {
},
volumes: [{ path: `/${config.name}` }]
},
config.port,
3000,
true,
config.subDomain
),
Expand Down
27 changes: 16 additions & 11 deletions src/env/env-utilities.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,27 @@ describe('EnvUtilities', () => {
});

test('addStaticVariable', async () => {
const variable: EnvVariable = fakeEnvVariable();
await EnvUtilities.addStaticVariable(variable);
for (let i: number = 0; i < 50; i++) {
await FileMockUtilities.setup(mockConstants);
await EnvUtilities.init('test.com');

const variable: EnvVariable = fakeEnvVariable();
await EnvUtilities.addStaticVariable(variable);

const lines: string[] = await FsUtilities.readFileLines(mockConstants.ENV);
expect(lines[2]).toEqual(`${variable.key}=${variable.value}`);
const lines: string[] = await FsUtilities.readFileLines(mockConstants.ENV);
expect(lines[2]).toEqual(`${variable.key}=${variable.value}`);

const variable2: EnvVariable = fakeEnvVariable();
await EnvUtilities.addStaticVariable(variable2);
const variable2: EnvVariable = fakeEnvVariable();
await EnvUtilities.addStaticVariable(variable2);

const lines2: string[] = await FsUtilities.readFileLines(mockConstants.ENV);
expect(lines2[3]).toEqual(`${variable2.key}=${variable2.value}`);
const lines2: string[] = await FsUtilities.readFileLines(mockConstants.ENV);
expect(lines2[3]).toEqual(`${variable2.key}=${variable2.value}`);

const globalEnvLines: string[] = await FsUtilities.readFileLines(mockConstants.GLOBAL_ENV_MODEL);
const globalEnvLines: string[] = await FsUtilities.readFileLines(mockConstants.GLOBAL_ENV_MODEL);

expect(globalEnvLines[7]).toEqual(` ${variable.key}${variable.required ? '' : '?'}: ${variable.type},`);
expect(globalEnvLines[8]).toEqual(` ${variable2.key}${variable2.required ? '' : '?'}: ${variable2.type}`);
expect(globalEnvLines[7]).toEqual(` ${variable.key}${variable.required ? '' : '?'}: ${variable.type},`);
expect(globalEnvLines[8]).toEqual(` ${variable2.key}${variable2.required ? '' : '?'}: ${variable2.type}`);
}
});

test('addCalculatedVariable', async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/env/env.utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ export abstract class EnvUtilities {
continue;
}
if (def.type === 'boolean' && (v === 'true' || v === 'false')) {
res.push({ key: key as EnvironmentVariableKey, value: Boolean(v), type: def.type, required: def.required });
res.push({ key: key as EnvironmentVariableKey, value: v === 'true', type: def.type, required: def.required });
continue;
}
if (def.type === 'number' && !Number.isNaN(Number(v))) {
Expand Down
39 changes: 39 additions & 0 deletions src/robots/robots-utilities.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

import { beforeEach, describe, expect, test } from '@jest/globals';

import { FileMockUtilities, getMockConstants, MockConstants } from '../__testing__';
import { RobotsUtilities } from './robots.utilities';
import { ROBOTS_FILE_NAME } from '../constants';
import { FsUtilities } from '../encapsulation';
import { DefaultEnvKeys, EnvUtilities } from '../env';
import { getPath } from '../utilities';

const mockConstants: MockConstants = getMockConstants('robots-utilities');

describe('RobotsUtilities', () => {

beforeEach(async () => {
await FileMockUtilities.setup(mockConstants, ['ANGULAR_APP_COMPONENT_TS']);
await EnvUtilities.init('test.com');
await EnvUtilities.addStaticVariable({ key: DefaultEnvKeys.baseUrl('angular'), required: true, type: 'string', value: 'www.test.com' });
});

test('createRobotsTxtForApp', async () => {
const isPublic: boolean = await EnvUtilities.getEnvVariable(DefaultEnvKeys.IS_PUBLIC, 'dev.docker-compose.yaml');
expect(isPublic).toBe(false);

await RobotsUtilities.createRobotsTxtForApp({
path: mockConstants.ANGULAR_APP_DIR,
name: mockConstants.ANGULAR_APP_NAME,
npmWorkspaceString: `apps/${mockConstants.ANGULAR_APP_NAME}`
}, 'dev.docker-compose.yaml');

const robotsTxt: string[] = await FsUtilities.readFileLines(getPath(mockConstants.ANGULAR_APP_DIR, 'src', ROBOTS_FILE_NAME));
expect(robotsTxt).toEqual([
'User-agent: *',
'Disallow: /',
'',
'Sitemap: www.test.com/sitemap.xml'
]);
});
});