Skip to content

Commit d97edce

Browse files
committed
Updated file system tests to be OS-agnostic
- Test results for write operations are now designed to match irrespective of the system's path encoding: The previously used UNIX-style path strings do not match on Windows systems. Therefore, expected paths are now being resolved as they are in their corresponding write function. - Unit tests should now pass on all systems.
1 parent e0596a2 commit d97edce

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

src/utils/writeClientCore.spec.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { EOL } from 'os';
2+
import { resolve } from 'path';
23

34
import type { Client } from '../client/interfaces/Client';
45
import { HttpClient } from '../HttpClient';
@@ -40,11 +41,11 @@ describe('writeClientCore', () => {
4041

4142
await writeClientCore(client, templates, '/', HttpClient.FETCH, Indent.SPACE_4);
4243

43-
expect(writeFile).toBeCalledWith('/OpenAPI.ts', `settings${EOL}`);
44-
expect(writeFile).toBeCalledWith('/ApiError.ts', `apiError${EOL}`);
45-
expect(writeFile).toBeCalledWith('/ApiRequestOptions.ts', `apiRequestOptions${EOL}`);
46-
expect(writeFile).toBeCalledWith('/ApiResult.ts', `apiResult${EOL}`);
47-
expect(writeFile).toBeCalledWith('/CancelablePromise.ts', `cancelablePromise${EOL}`);
48-
expect(writeFile).toBeCalledWith('/request.ts', `request${EOL}`);
44+
expect(writeFile).toBeCalledWith(resolve('/', '/OpenAPI.ts'), `settings${EOL}`);
45+
expect(writeFile).toBeCalledWith(resolve('/', '/ApiError.ts'), `apiError${EOL}`);
46+
expect(writeFile).toBeCalledWith(resolve('/', '/ApiRequestOptions.ts'), `apiRequestOptions${EOL}`);
47+
expect(writeFile).toBeCalledWith(resolve('/', '/ApiResult.ts'), `apiResult${EOL}`);
48+
expect(writeFile).toBeCalledWith(resolve('/', '/CancelablePromise.ts'), `cancelablePromise${EOL}`);
49+
expect(writeFile).toBeCalledWith(resolve('/', '/request.ts'), `request${EOL}`);
4950
});
5051
});

src/utils/writeClientIndex.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { resolve } from 'path';
2+
13
import type { Client } from '../client/interfaces/Client';
24
import { writeFile } from './fileSystem';
35
import type { Templates } from './registerHandlebarTemplates';
@@ -36,6 +38,6 @@ describe('writeClientIndex', () => {
3638

3739
await writeClientIndex(client, templates, '/', true, true, true, true, true, 'Service', '');
3840

39-
expect(writeFile).toBeCalledWith('/index.ts', 'index');
41+
expect(writeFile).toBeCalledWith(resolve('/', '/index.ts'), 'index');
4042
});
4143
});

src/utils/writeClientModels.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { EOL } from 'os';
2+
import { resolve } from 'path';
23

34
import type { Model } from '../client/interfaces/Model';
45
import { HttpClient } from '../HttpClient';
@@ -53,6 +54,6 @@ describe('writeClientModels', () => {
5354

5455
await writeClientModels(models, templates, '/', HttpClient.FETCH, false, Indent.SPACE_4);
5556

56-
expect(writeFile).toBeCalledWith('/User.ts', `model${EOL}`);
57+
expect(writeFile).toBeCalledWith(resolve('/', '/User.ts'), `model${EOL}`);
5758
});
5859
});

src/utils/writeClientSchemas.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { EOL } from 'os';
2+
import { resolve } from 'path';
23

34
import type { Model } from '../client/interfaces/Model';
45
import { HttpClient } from '../HttpClient';
@@ -53,6 +54,6 @@ describe('writeClientSchemas', () => {
5354

5455
await writeClientSchemas(models, templates, '/', HttpClient.FETCH, false, Indent.SPACE_4);
5556

56-
expect(writeFile).toBeCalledWith('/$User.ts', `schema${EOL}`);
57+
expect(writeFile).toBeCalledWith(resolve('/', '/$User.ts'), `schema${EOL}`);
5758
});
5859
});

src/utils/writeClientServices.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { EOL } from 'os';
2+
import { resolve } from 'path';
23

34
import type { Service } from '../client/interfaces/Service';
45
import { HttpClient } from '../HttpClient';
@@ -41,6 +42,6 @@ describe('writeClientServices', () => {
4142

4243
await writeClientServices(services, templates, '/', HttpClient.FETCH, false, false, Indent.SPACE_4, 'Service');
4344

44-
expect(writeFile).toBeCalledWith('/UserService.ts', `service${EOL}`);
45+
expect(writeFile).toBeCalledWith(resolve('/', '/UserService.ts'), `service${EOL}`);
4546
});
4647
});

0 commit comments

Comments
 (0)