Skip to content

test: fix paths for Windows #1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NikitaKorevo wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −32
Open

test: fix paths for Windows #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 21 additions & 20 deletions apps/generator-cli/src/app/services/generator.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { delimiter, resolve } from 'path';
import { Test } from '@nestjs/testing';
import { GeneratorService } from './generator.service';
import { LOGGER } from '../constants';
Expand Down Expand Up @@ -134,18 +135,18 @@ describe('GeneratorService', () => {
const cmd = (name, appendix: string[]) => ({
name,
command: `java -jar "/path/to/4.2.1.jar" generate ${appendix.join(
' '
' ',
)}`,
});

const cmdWithCustomJar = (
name: string,
customJar: string,
appendix: string[]
appendix: string[],
) => ({
name,
command: `java -cp "/path/to/4.2.1.jar:${customJar}" org.openapitools.codegen.OpenAPIGenerator generate ${appendix.join(
' '
command: `java -cp "/path/to/4.2.1.jar${delimiter}${customJar}" org.openapitools.codegen.OpenAPIGenerator generate ${appendix.join(
' ',
)}`,
});

Expand All @@ -154,39 +155,39 @@ describe('GeneratorService', () => {
'foo.json',
[
cmd('[angular] abc/app/pet.yaml', [
`--input-spec="${cwd}/abc/app/pet.yaml"`,
`--input-spec="${resolve(cwd, 'abc/app/pet.yaml')}"`,
`--output="${cwd}/generated-sources/openapi/typescript-angular/pet"`,
`--generator-name="typescript-angular"`,
`--additional-properties="fileNaming=kebab-case,apiModulePrefix=Pet,npmName=petRestClient,supportsES6=true,withInterfaces=true"`,
]),
cmd('[angular] abc/app/car.yaml', [
`--input-spec="${cwd}/abc/app/car.yaml"`,
`--input-spec="${resolve(cwd, 'abc/app/car.yaml')}"`,
`--output="${cwd}/generated-sources/openapi/typescript-angular/car"`,
`--generator-name="typescript-angular"`,
`--additional-properties="fileNaming=kebab-case,apiModulePrefix=Car,npmName=carRestClient,supportsES6=true,withInterfaces=true"`,
]),
cmd('[baz] def/app/pet.yaml', [
`--input-spec="${cwd}/def/app/pet.yaml"`,
`--input-spec="${resolve(cwd, 'def/app/pet.yaml')}"`,
`--name="pet"`,
`--name-uc-first="Pet"`,
`--cwd="${cwd}"`,
`--base="pet.yaml"`,
`--dir="${cwd}/def/app"`,
`--path="${cwd}/def/app/pet.yaml"`,
`--dir="${resolve(cwd, 'def/app')}"`,
`--path="${resolve(cwd, 'def/app/pet.yaml')}"`,
`--rel-dir="def/app"`,
`--rel-path="def/app/pet.yaml"`,
`--ext="yaml"`,
'--some-bool',
'--some-int=1',
]),
cmd('[baz] def/app/car.json', [
`--input-spec="${cwd}/def/app/car.json"`,
`--input-spec="${resolve(cwd, 'def/app/car.json')}"`,
`--name="car"`,
`--name-uc-first="Car"`,
`--cwd="${cwd}"`,
`--base="car.json"`,
`--dir="${cwd}/def/app"`,
`--path="${cwd}/def/app/car.json"`,
`--dir="${resolve(cwd, 'def/app')}"`,
`--path="${resolve(cwd, 'def/app/car.json')}"`,
`--rel-dir="def/app"`,
`--rel-path="def/app/car.json"`,
`--ext="json"`,
Expand All @@ -199,12 +200,12 @@ describe('GeneratorService', () => {
'bar.json',
[
cmd('[bar] api/cat.yaml', [
`--input-spec="${cwd}/api/cat.yaml"`,
`--input-spec="${resolve(cwd, 'api/cat.yaml')}"`,
`--output="bar/cat"`,
'--some-bool',
]),
cmd('[bar] api/bird.json', [
`--input-spec="${cwd}/api/bird.json"`,
`--input-spec="${resolve(cwd, 'api/bird.json')}"`,
`--output="bar/bird"`,
'--some-bool',
]),
Expand All @@ -214,12 +215,12 @@ describe('GeneratorService', () => {
'bar.json',
[
cmdWithCustomJar('[bar] api/cat.yaml', '../some/custom.jar', [
`--input-spec="${cwd}/api/cat.yaml"`,
`--input-spec="${resolve(cwd, 'api/cat.yaml')}"`,
`--output="bar/cat"`,
'--some-bool',
]),
cmdWithCustomJar('[bar] api/bird.json', '../some/custom.jar', [
`--input-spec="${cwd}/api/bird.json"`,
`--input-spec="${resolve(cwd, 'api/bird.json')}"`,
`--output="bar/bird"`,
'--some-bool',
]),
Expand Down Expand Up @@ -251,7 +252,7 @@ describe('GeneratorService', () => {

beforeEach(async () => {
configGet.mockImplementation(
(path, defaultValue) => config[filePath] || defaultValue
(path, defaultValue) => config[filePath] || defaultValue,
);
returnValue = await fixture.generate(customGenerator);
});
Expand All @@ -260,7 +261,7 @@ describe('GeneratorService', () => {
expect(configGet).toHaveBeenNthCalledWith(
1,
'generator-cli.generators',
{}
{},
);
});

Expand Down Expand Up @@ -296,11 +297,11 @@ describe('GeneratorService', () => {
expect(executedCommands).toEqual([
{
name: '[bar] api/cat.yaml',
command: `java -jar "../some/custom.jar" generate --input-spec="${cwd}/api/cat.yaml" --output="bar/cat" --some-bool`,
command: `java -jar "../some/custom.jar" generate --input-spec="${resolve(cwd, 'api/cat.yaml')}" --output="bar/cat" --some-bool`,
},
{
name: '[bar] api/bird.json',
command: `java -jar "../some/custom.jar" generate --input-spec="${cwd}/api/bird.json" --output="bar/bird" --some-bool`,
command: `java -jar "../some/custom.jar" generate --input-spec="${resolve(cwd, 'api/bird.json')}" --output="bar/bird" --some-bool`,
},
]);
});
Expand Down
25 changes: 13 additions & 12 deletions apps/generator-cli/src/app/services/version-manager.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import { of } from 'rxjs';
import { LOGGER } from '../constants';
import chalk from 'chalk';
import { ConfigService } from './config.service';
import { resolve } from 'path';
import { join, normalize, resolve } from 'path';
import * as os from 'os';
import { TestingModule } from '@nestjs/testing/testing-module';
import * as path from 'path';

jest.mock('fs-extra');

Expand Down Expand Up @@ -328,7 +327,7 @@ describe('VersionManagerService', () => {
it('removes the correct file', () => {
expect(fs.removeSync).toHaveBeenNthCalledWith(
1,
`${fixture.storage}/4.3.1.jar`,
resolve(fixture.storage, '4.3.1.jar'),
);
});

Expand Down Expand Up @@ -446,7 +445,7 @@ describe('VersionManagerService', () => {
before: [chalk.yellow(`Download 4.2.0 ...`)],
after: [
chalk.green(
`Downloaded 4.2.0 to custom storage location ${expected}`,
`Downloaded 4.2.0 to custom storage location ${resolve(expected)}`,
),
],
});
Expand All @@ -473,22 +472,22 @@ describe('VersionManagerService', () => {
it('creates a temporary directory', () => {
expect(fs.mkdtempSync).toHaveBeenNthCalledWith(
1,
path.join(os.tmpdir(), 'generator-cli-'),
join(os.tmpdir(), 'generator-cli-'),
);
});

it('creates the correct write stream', () => {
expect(fs.createWriteStream).toHaveBeenNthCalledWith(
1,
'/tmp/generator-cli-abcDEF/4.2.0',
normalize('/tmp/generator-cli-abcDEF/4.2.0'),
);
});

it('moves the file to the target location', () => {
expect(fs.moveSync).toHaveBeenNthCalledWith(
1,
'/tmp/generator-cli-abcDEF/4.2.0',
`${fixture.storage}/4.2.0.jar`,
normalize('/tmp/generator-cli-abcDEF/4.2.0'),
resolve(fixture.storage, '4.2.0.jar'),
{ overwrite: true },
);
});
Expand Down Expand Up @@ -563,20 +562,22 @@ describe('VersionManagerService', () => {
fixture.isDownloaded('4.3.1');
expect(fs.existsSync).toHaveBeenNthCalledWith(
1,
fixture.storage + '/4.3.1.jar',
resolve(fixture.storage, '4.3.1.jar'),
);
});
});

describe('filePath()', () => {
it('returns the path to the given version name', () => {
expect(fixture.filePath('1.2.3')).toEqual(
`${fixture.storage}/1.2.3.jar`,
resolve(fixture.storage, '1.2.3.jar'),
);
});

it('returns the path to the selected version name as default', () => {
expect(fixture.filePath()).toEqual(`${fixture.storage}/4.3.0.jar`);
expect(fixture.filePath()).toEqual(
resolve(fixture.storage, '4.3.0.jar'),
);
});
});

Expand All @@ -597,7 +598,7 @@ describe('VersionManagerService', () => {
])('returns %s for %s', async (expected, cfgValue) => {
getStorageDir.mockReturnValue(cfgValue);
await compile();
expect(fixture.storage).toEqual(expected);
expect(fixture.storage).toEqual(resolve(expected));
});
});
});
Expand Down