fix(test): reorganized tests under __tests__ directory

patrick-medusajs · patrick-medusajs · commit 40ce44982021 · 2023-01-19T14:19:42.000-05:00
diff --git a/src/__tests__/index.spec.ts b/src/__tests__/index.spec.ts
@@ -1,4 +1,4 @@
-import OpenAPI from './index';
+import OpenAPI from '../index';
 
 describe('index', () => {
     it('parses v2 without issues', async () => {
diff --git a/src/utils/__mocks__/templates.ts b/src/utils/__mocks__/templates.ts
@@ -0,0 +1,24 @@
+import { Templates } from '../registerHandlebarTemplates';
+
+export const templates: Templates = {
+    index: () => 'index',
+    client: () => 'client',
+    useClient: () => 'useClient',
+    exports: {
+        model: () => 'model',
+        schema: () => 'schema',
+        service: () => 'service',
+        hook: () => 'hook',
+    },
+    core: {
+        settings: () => 'settings',
+        apiError: () => 'apiError',
+        apiRequestOptions: () => 'apiRequestOptions',
+        apiResult: () => 'apiResult',
+        cancelablePromise: () => 'cancelablePromise',
+        request: () => 'request',
+        baseHttpRequest: () => 'baseHttpRequest',
+        httpRequest: () => 'httpRequest',
+        hookUtils: () => 'hookUtils',
+    },
+};
diff --git a/src/utils/__tests__/flatMap.spec.ts b/src/utils/__tests__/flatMap.spec.ts
@@ -1,4 +1,4 @@
-import { flatMap } from './flatMap';
+import { flatMap } from '../flatMap';
 
 describe('flatMap', () => {
     it('should produce correct result', () => {
diff --git a/src/utils/__tests__/formatCode.spec.ts b/src/utils/__tests__/formatCode.spec.ts
@@ -1,4 +1,4 @@
-import { formatCode } from './formatCode';
+import { formatCode } from '../formatCode';
 
 const input1 = `{ foo: true }`;
 
diff --git a/src/utils/__tests__/getModelNames.spec.ts b/src/utils/__tests__/getModelNames.spec.ts
@@ -1,5 +1,5 @@
-import type { Model } from '../client/interfaces/Model';
-import { getModelNames } from './getModelNames';
+import type { Model } from '../../client/interfaces/Model';
+import { getModelNames } from '../getModelNames';
 
 describe('getModelNames', () => {
     it('should return sorted list', () => {
diff --git a/src/utils/__tests__/getOpenApiVersion.spec.ts b/src/utils/__tests__/getOpenApiVersion.spec.ts
@@ -1,4 +1,4 @@
-import { getOpenApiVersion } from './getOpenApiVersion';
+import { getOpenApiVersion } from '../getOpenApiVersion';
 
 describe('getOpenApiVersion', () => {
     it('should read the correct version', () => {
diff --git a/src/utils/__tests__/getPattern.spec.ts b/src/utils/__tests__/getPattern.spec.ts
@@ -1,4 +1,4 @@
-import { getPattern } from './getPattern';
+import { getPattern } from '../getPattern';
 
 describe('getPattern', () => {
     it('should produce correct result', () => {
diff --git a/src/utils/__tests__/getServiceNames.spec.ts b/src/utils/__tests__/getServiceNames.spec.ts
@@ -1,5 +1,5 @@
-import type { Service } from '../client/interfaces/Service';
-import { getServiceNames } from './getServiceNames';
+import type { Service } from '../../client/interfaces/Service';
+import { getServiceNames } from '../getServiceNames';
 
 describe('getServiceNames', () => {
     it('should return sorted list', () => {
diff --git a/src/utils/__tests__/isSubdirectory.spec.ts b/src/utils/__tests__/isSubdirectory.spec.ts
@@ -1,6 +1,6 @@
 import { resolve } from 'path';
 
-import { isSubDirectory } from './isSubdirectory';
+import { isSubDirectory } from '../isSubdirectory';
 
 describe('isSubDirectory', () => {
     it('should return correct result', () => {
diff --git a/src/utils/__tests__/registerHandlebarHelpers.spec.ts b/src/utils/__tests__/registerHandlebarHelpers.spec.ts
@@ -1,7 +1,7 @@
 import Handlebars from 'handlebars/runtime';
 
-import { HttpClient } from '../HttpClient';
-import { registerHandlebarHelpers } from './registerHandlebarHelpers';
+import { HttpClient } from '../../HttpClient';
+import { registerHandlebarHelpers } from '../registerHandlebarHelpers';
 
 describe('registerHandlebarHelpers', () => {
     it('should register the helpers', () => {
diff --git a/src/utils/__tests__/registerHandlebarTemplates.spec.ts b/src/utils/__tests__/registerHandlebarTemplates.spec.ts
@@ -1,5 +1,5 @@
-import { HttpClient } from '../HttpClient';
-import { registerHandlebarTemplates } from './registerHandlebarTemplates';
+import { HttpClient } from '../../HttpClient';
+import { registerHandlebarTemplates } from '../registerHandlebarTemplates';
 
 describe('registerHandlebarTemplates', () => {
     it('should return correct templates', () => {
@@ -8,7 +8,8 @@ describe('registerHandlebarTemplates', () => {
             useOptions: false,
             useUnionTypes: false,
         });
-        expect(templates.index).toBeDefined();
+        expect(templates.indexes.index).toBeDefined();
+        expect(templates.indexes.indexModels).toBeDefined();
         expect(templates.exports.model).toBeDefined();
         expect(templates.exports.schema).toBeDefined();
         expect(templates.exports.service).toBeDefined();
diff --git a/src/utils/__tests__/sortModelsByName.spec.ts b/src/utils/__tests__/sortModelsByName.spec.ts
@@ -1,5 +1,5 @@
-import type { Model } from '../client/interfaces/Model';
-import { sortModelsByName } from './sortModelsByName';
+import type { Model } from '../../client/interfaces/Model';
+import { sortModelsByName } from '../sortModelsByName';
 
 describe('sortModelsByName', () => {
     it('should return sorted list', () => {
diff --git a/src/utils/__tests__/sortServicesByName.spec.ts b/src/utils/__tests__/sortServicesByName.spec.ts
@@ -1,5 +1,5 @@
-import type { Service } from '../client/interfaces/Service';
-import { sortServicesByName } from './sortServicesByName';
+import type { Service } from '../../client/interfaces/Service';
+import { sortServicesByName } from '../sortServicesByName';
 
 describe('sortServicesByName', () => {
     it('should return sorted list', () => {
diff --git a/src/utils/__tests__/writeClient.spec.ts b/src/utils/__tests__/writeClient.spec.ts
@@ -0,0 +1,40 @@
+import type { Client } from '../../client/interfaces/Client';
+import { HttpClient } from '../../HttpClient';
+import { Indent } from '../../Indent';
+import { mkdir, rmdir, writeFile } from '../fileSystem';
+import { writeClient } from '../writeClient';
+import { templates } from '../__mocks__/templates';
+
+jest.mock('./fileSystem');
+
+describe('writeClient', () => {
+    it('should write to filesystem', async () => {
+        const client: Client = {
+            server: 'http://localhost:8080',
+            version: 'v1',
+            models: [],
+            services: [],
+        };
+
+        await writeClient(
+            client,
+            templates,
+            './dist',
+            HttpClient.FETCH,
+            false,
+            false,
+            true,
+            true,
+            true,
+            true,
+            true,
+            Indent.SPACE_4,
+            'Service',
+            'AppClient'
+        );
+
+        expect(rmdir).toBeCalled();
+        expect(mkdir).toBeCalled();
+        expect(writeFile).toBeCalled();
+    });
+});
diff --git a/src/utils/__tests__/writeClientClass.spec.ts b/src/utils/__tests__/writeClientClass.spec.ts
@@ -0,0 +1,23 @@
+import type { Client } from '../../client/interfaces/Client';
+import { HttpClient } from '../../HttpClient';
+import { Indent } from '../../Indent';
+import { writeFile } from '../fileSystem';
+import { writeClientClass } from '../writeClientClass';
+import { templates } from '../__mocks__/templates';
+
+jest.mock('./fileSystem');
+
+describe('writeClientClass', () => {
+    it('should write to filesystem', async () => {
+        const client: Client = {
+            server: 'http://localhost:8080',
+            version: 'v1',
+            models: [],
+            services: [],
+        };
+
+        await writeClientClass(client, templates, './dist', HttpClient.FETCH, 'AppClient', Indent.SPACE_4, '');
+
+        expect(writeFile).toBeCalled();
+    });
+});
diff --git a/src/utils/__tests__/writeClientCore.spec.ts b/src/utils/__tests__/writeClientCore.spec.ts
@@ -0,0 +1,30 @@
+import { EOL } from 'os';
+
+import type { Client } from '../../client/interfaces/Client';
+import { HttpClient } from '../../HttpClient';
+import { Indent } from '../../Indent';
+import { writeFile } from '../fileSystem';
+import { writeClientCore } from '../writeClientCore';
+import { templates } from '../__mocks__/templates';
+
+jest.mock('./fileSystem');
+
+describe('writeClientCore', () => {
+    it('should write to filesystem', async () => {
+        const client: Client = {
+            server: 'http://localhost:8080',
+            version: '1.0',
+            models: [],
+            services: [],
+        };
+
+        await writeClientCore(client, templates, '/', HttpClient.FETCH, Indent.SPACE_4);
+
+        expect(writeFile).toBeCalledWith('/OpenAPI.ts', `settings${EOL}`);
+        expect(writeFile).toBeCalledWith('/ApiError.ts', `apiError${EOL}`);
+        expect(writeFile).toBeCalledWith('/ApiRequestOptions.ts', `apiRequestOptions${EOL}`);
+        expect(writeFile).toBeCalledWith('/ApiResult.ts', `apiResult${EOL}`);
+        expect(writeFile).toBeCalledWith('/CancelablePromise.ts', `cancelablePromise${EOL}`);
+        expect(writeFile).toBeCalledWith('/request.ts', `request${EOL}`);
+    });
+});
diff --git a/src/utils/__tests__/writeClientIndex.spec.ts b/src/utils/__tests__/writeClientIndex.spec.ts
@@ -0,0 +1,21 @@
+import type { Client } from '../../client/interfaces/Client';
+import { writeFile } from '../fileSystem';
+import { writeClientIndex } from '../writeClientIndex';
+import { templates } from '../__mocks__/templates';
+
+jest.mock('./fileSystem');
+
+describe('writeClientIndex', () => {
+    it('should write to filesystem', async () => {
+        const client: Client = {
+            server: 'http://localhost:8080',
+            version: '1.0',
+            models: [],
+            services: [],
+        };
+
+        await writeClientIndex(client, templates, '/', true, true, true, true, true, true, 'Service', '');
+
+        expect(writeFile).toBeCalledWith('/index.ts', 'index');
+    });
+});
diff --git a/src/utils/__tests__/writeClientModels.spec.ts b/src/utils/__tests__/writeClientModels.spec.ts
@@ -0,0 +1,39 @@
+import { EOL } from 'os';
+
+import type { Model } from '../../client/interfaces/Model';
+import { HttpClient } from '../../HttpClient';
+import { Indent } from '../../Indent';
+import { writeFile } from '../fileSystem';
+import { writeClientModels } from '../writeClientModels';
+import { templates } from '../__mocks__/templates';
+
+jest.mock('./fileSystem');
+
+describe('writeClientModels', () => {
+    it('should write to filesystem', async () => {
+        const models: Model[] = [
+            {
+                spec: {},
+                export: 'interface',
+                name: 'User',
+                type: 'User',
+                base: 'User',
+                template: null,
+                link: null,
+                description: null,
+                isDefinition: true,
+                isReadOnly: false,
+                isRequired: false,
+                isNullable: false,
+                imports: [],
+                enum: [],
+                enums: [],
+                properties: [],
+            },
+        ];
+
+        await writeClientModels(models, templates, '/', HttpClient.FETCH, false, Indent.SPACE_4);
+
+        expect(writeFile).toBeCalledWith('/User.ts', `model${EOL}`);
+    });
+});
diff --git a/src/utils/__tests__/writeClientSchemas.spec.ts b/src/utils/__tests__/writeClientSchemas.spec.ts
@@ -0,0 +1,39 @@
+import { EOL } from 'os';
+
+import type { Model } from '../../client/interfaces/Model';
+import { HttpClient } from '../../HttpClient';
+import { Indent } from '../../Indent';
+import { writeFile } from '../fileSystem';
+import { writeClientSchemas } from '../writeClientSchemas';
+import { templates } from '../__mocks__/templates';
+
+jest.mock('./fileSystem');
+
+describe('writeClientSchemas', () => {
+    it('should write to filesystem', async () => {
+        const models: Model[] = [
+            {
+                spec: {},
+                export: 'interface',
+                name: 'User',
+                type: 'User',
+                base: 'User',
+                template: null,
+                link: null,
+                description: null,
+                isDefinition: true,
+                isReadOnly: false,
+                isRequired: false,
+                isNullable: false,
+                imports: [],
+                enum: [],
+                enums: [],
+                properties: [],
+            },
+        ];
+
+        await writeClientSchemas(models, templates, '/', HttpClient.FETCH, false, Indent.SPACE_4);
+
+        expect(writeFile).toBeCalledWith('/$User.ts', `schema${EOL}`);
+    });
+});
diff --git a/src/utils/__tests__/writeClientServices.spec.ts b/src/utils/__tests__/writeClientServices.spec.ts
@@ -0,0 +1,26 @@
+import { EOL } from 'os';
+
+import type { Service } from '../../client/interfaces/Service';
+import { HttpClient } from '../../HttpClient';
+import { Indent } from '../../Indent';
+import { writeFile } from '../fileSystem';
+import { writeClientServices } from '../writeClientServices';
+import { templates } from '../__mocks__/templates';
+
+jest.mock('./fileSystem');
+
+describe('writeClientServices', () => {
+    it('should write to filesystem', async () => {
+        const services: Service[] = [
+            {
+                name: 'User',
+                operations: [],
+                imports: [],
+            },
+        ];
+
+        await writeClientServices(services, templates, '/', HttpClient.FETCH, false, false, Indent.SPACE_4, 'Service');
+
+        expect(writeFile).toBeCalledWith('/UserService.ts', `service${EOL}`);
+    });
+});
diff --git a/src/utils/writeClient.spec.ts b/src/utils/writeClient.spec.ts
diff --git a/src/utils/writeClientClass.spec.ts b/src/utils/writeClientClass.spec.ts
diff --git a/src/utils/writeClientCore.spec.ts b/src/utils/writeClientCore.spec.ts
diff --git a/src/utils/writeClientIndex.spec.ts b/src/utils/writeClientIndex.spec.ts
diff --git a/src/utils/writeClientModels.spec.ts b/src/utils/writeClientModels.spec.ts
diff --git a/src/utils/writeClientSchemas.spec.ts b/src/utils/writeClientSchemas.spec.ts
diff --git a/src/utils/writeClientServices.spec.ts b/src/utils/writeClientServices.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import OpenAPI from './index';`
	`1`	`+import OpenAPI from '../index';`
`2`	`2`
`3`	`3`	`describe('index', () => {`
`4`	`4`	`it('parses v2 without issues', async () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { flatMap } from './flatMap';`
	`1`	`+import { flatMap } from '../flatMap';`
`2`	`2`
`3`	`3`	`describe('flatMap', () => {`
`4`	`4`	`it('should produce correct result', () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { formatCode } from './formatCode';`
	`1`	`+import { formatCode } from '../formatCode';`
`2`	`2`
`3`	`3`	const input1 = `{ foo: true }`;
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { getOpenApiVersion } from './getOpenApiVersion';`
	`1`	`+import { getOpenApiVersion } from '../getOpenApiVersion';`
`2`	`2`
`3`	`3`	`describe('getOpenApiVersion', () => {`
`4`	`4`	`it('should read the correct version', () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { getPattern } from './getPattern';`
	`1`	`+import { getPattern } from '../getPattern';`
`2`	`2`
`3`	`3`	`describe('getPattern', () => {`
`4`	`4`	`it('should produce correct result', () => {`