mokkenstorm.dev / openapi-ts
fork of hey-api/openapi-ts because I need some additional things
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #105 from jordanshatford/fix/e2e-tests

fix: run e2e tests in ci

authored by

Lubos and committed by
GitHub 50d1e9a6 b553a125

+219 -66
+2 -2
.github/workflows/ci.yml
··· 35 35 - name: Run unit tests 36 36 run: npm run test 37 37 38 - # - name: Run e2e tests 39 - # run: npm run test:e2e 38 + - name: Run e2e tests 39 + run: npm run test:e2e
+91
package-lock.json
··· 49 49 "eslint-plugin-simple-import-sort": "12.0.0", 50 50 "express": "4.18.3", 51 51 "form-data": "4.0.0", 52 + "node-fetch": "3.3.2", 52 53 "npm-run-all2": "6.1.2", 53 54 "prettier": "3.2.5", 54 55 "puppeteer": "22.5.0", ··· 7630 7631 "pend": "~1.2.0" 7631 7632 } 7632 7633 }, 7634 + "node_modules/fetch-blob": { 7635 + "version": "3.2.0", 7636 + "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", 7637 + "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", 7638 + "dev": true, 7639 + "funding": [ 7640 + { 7641 + "type": "github", 7642 + "url": "https://github.com/sponsors/jimmywarting" 7643 + }, 7644 + { 7645 + "type": "paypal", 7646 + "url": "https://paypal.me/jimmywarting" 7647 + } 7648 + ], 7649 + "dependencies": { 7650 + "node-domexception": "^1.0.0", 7651 + "web-streams-polyfill": "^3.0.3" 7652 + }, 7653 + "engines": { 7654 + "node": "^12.20 || >= 14.13" 7655 + } 7656 + }, 7633 7657 "node_modules/figures": { 7634 7658 "version": "3.2.0", 7635 7659 "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", ··· 7877 7901 }, 7878 7902 "engines": { 7879 7903 "node": ">= 6" 7904 + } 7905 + }, 7906 + "node_modules/formdata-polyfill": { 7907 + "version": "4.0.10", 7908 + "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", 7909 + "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", 7910 + "dev": true, 7911 + "dependencies": { 7912 + "fetch-blob": "^3.1.2" 7913 + }, 7914 + "engines": { 7915 + "node": ">=12.20.0" 7880 7916 } 7881 7917 }, 7882 7918 "node_modules/forwarded": { ··· 10083 10119 "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", 10084 10120 "dev": true, 10085 10121 "optional": true 10122 + }, 10123 + "node_modules/node-domexception": { 10124 + "version": "1.0.0", 10125 + "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", 10126 + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", 10127 + "dev": true, 10128 + "funding": [ 10129 + { 10130 + "type": "github", 10131 + "url": "https://github.com/sponsors/jimmywarting" 10132 + }, 10133 + { 10134 + "type": "github", 10135 + "url": "https://paypal.me/jimmywarting" 10136 + } 10137 + ], 10138 + "engines": { 10139 + "node": ">=10.5.0" 10140 + } 10141 + }, 10142 + "node_modules/node-fetch": { 10143 + "version": "3.3.2", 10144 + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", 10145 + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", 10146 + "dev": true, 10147 + "dependencies": { 10148 + "data-uri-to-buffer": "^4.0.0", 10149 + "fetch-blob": "^3.1.4", 10150 + "formdata-polyfill": "^4.0.10" 10151 + }, 10152 + "engines": { 10153 + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" 10154 + }, 10155 + "funding": { 10156 + "type": "opencollective", 10157 + "url": "https://opencollective.com/node-fetch" 10158 + } 10159 + }, 10160 + "node_modules/node-fetch/node_modules/data-uri-to-buffer": { 10161 + "version": "4.0.1", 10162 + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", 10163 + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", 10164 + "dev": true, 10165 + "engines": { 10166 + "node": ">= 12" 10167 + } 10086 10168 }, 10087 10169 "node_modules/node-forge": { 10088 10170 "version": "1.3.1", ··· 14044 14126 "dev": true, 14045 14127 "dependencies": { 14046 14128 "defaults": "^1.0.3" 14129 + } 14130 + }, 14131 + "node_modules/web-streams-polyfill": { 14132 + "version": "3.3.3", 14133 + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", 14134 + "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", 14135 + "dev": true, 14136 + "engines": { 14137 + "node": ">= 8" 14047 14138 } 14048 14139 }, 14049 14140 "node_modules/webpack": {
+1
package.json
··· 102 102 "eslint-plugin-simple-import-sort": "12.0.0", 103 103 "express": "4.18.3", 104 104 "form-data": "4.0.0", 105 + "node-fetch": "3.3.2", 105 106 "npm-run-all2": "6.1.2", 106 107 "prettier": "3.2.5", 107 108 "puppeteer": "22.5.0",
+11 -7
test/e2e/client.axios.spec.ts
··· 18 18 }); 19 19 20 20 it('requests token', async () => { 21 - const { ApiClient } = require('./generated/client/axios/index.js'); 21 + const { ApiClient } = await import('./generated/client/axios/index.js'); 22 22 const tokenRequest = vi.fn().mockResolvedValue('MY_TOKEN'); 23 23 const client = new ApiClient({ 24 24 TOKEN: tokenRequest, ··· 27 27 }); 28 28 const result = await client.simple.getCallWithoutParametersAndResponse(); 29 29 expect(tokenRequest.mock.calls.length).toBe(1); 30 + // @ts-ignore 30 31 expect(result.headers.authorization).toBe('Bearer MY_TOKEN'); 31 32 }); 32 33 33 34 it('uses credentials', async () => { 34 - const { ApiClient } = require('./generated/client/axios/index.js'); 35 + const { ApiClient } = await import('./generated/client/axios/index.js'); 35 36 const client = new ApiClient({ 36 37 TOKEN: undefined, 37 38 USERNAME: 'username', 38 39 PASSWORD: 'password', 39 40 }); 40 41 const result = await client.simple.getCallWithoutParametersAndResponse(); 42 + // @ts-ignore 41 43 expect(result.headers.authorization).toBe('Basic dXNlcm5hbWU6cGFzc3dvcmQ='); 42 44 }); 43 45 44 46 it('supports complex params', async () => { 45 - const { ApiClient } = require('./generated/client/axios/index.js'); 47 + const { ApiClient } = await import('./generated/client/axios/index.js'); 46 48 const client = new ApiClient(); 49 + // @ts-ignore 47 50 const result = await client.complex.complexTypes({ 48 51 first: { 49 52 second: { ··· 55 58 }); 56 59 57 60 it('supports form data', async () => { 58 - const { ApiClient } = require('./generated/client/axios/index.js'); 61 + const { ApiClient } = await import('./generated/client/axios/index.js'); 59 62 const client = new ApiClient(); 63 + // @ts-ignore 60 64 const result = await client.parameters.callWithParameters( 61 65 'valueHeader', 62 66 'valueQuery', ··· 73 77 it('can abort the request', async () => { 74 78 let error; 75 79 try { 76 - const { ApiClient } = require('./generated/client/axios/index.js'); 80 + const { ApiClient } = await import('./generated/client/axios/index.js'); 77 81 const client = new ApiClient(); 78 82 const promise = client.simple.getCallWithoutParametersAndResponse(); 79 83 setTimeout(() => { ··· 89 93 it('should throw known error (500)', async () => { 90 94 let error; 91 95 try { 92 - const { ApiClient } = require('./generated/client/axios/index.js'); 96 + const { ApiClient } = await import('./generated/client/axios/index.js'); 93 97 const client = new ApiClient(); 94 98 await client.error.testErrorCode(500); 95 99 } catch (err) { ··· 120 124 it('should throw unknown error (409)', async () => { 121 125 let error; 122 126 try { 123 - const { ApiClient } = require('./generated/client/axios/index.js'); 127 + const { ApiClient } = await import('./generated/client/axios/index.js'); 124 128 const client = new ApiClient(); 125 129 await client.error.testErrorCode(409); 126 130 } catch (err) {
+11 -7
test/e2e/client.node.spec.ts
··· 18 18 }); 19 19 20 20 it('requests token', async () => { 21 - const { ApiClient } = require('./generated/client/node/index.js'); 21 + const { ApiClient } = await import('./generated/client/node/index.js'); 22 22 const tokenRequest = vi.fn().mockResolvedValue('MY_TOKEN'); 23 23 const client = new ApiClient({ 24 24 TOKEN: tokenRequest, ··· 27 27 }); 28 28 const result = await client.simple.getCallWithoutParametersAndResponse(); 29 29 expect(tokenRequest.mock.calls.length).toBe(1); 30 + // @ts-ignore 30 31 expect(result.headers.authorization).toBe('Bearer MY_TOKEN'); 31 32 }); 32 33 33 34 it('uses credentials', async () => { 34 - const { ApiClient } = require('./generated/client/node/index.js'); 35 + const { ApiClient } = await import('./generated/client/node/index.js'); 35 36 const client = new ApiClient({ 36 37 TOKEN: undefined, 37 38 USERNAME: 'username', 38 39 PASSWORD: 'password', 39 40 }); 40 41 const result = await client.simple.getCallWithoutParametersAndResponse(); 42 + // @ts-ignore 41 43 expect(result.headers.authorization).toBe('Basic dXNlcm5hbWU6cGFzc3dvcmQ='); 42 44 }); 43 45 44 46 it('supports complex params', async () => { 45 - const { ApiClient } = require('./generated/client/node/index.js'); 47 + const { ApiClient } = await import('./generated/client/node/index.js'); 46 48 const client = new ApiClient(); 49 + // @ts-ignore 47 50 const result = await client.complex.complexTypes({ 48 51 first: { 49 52 second: { ··· 55 58 }); 56 59 57 60 it('support form data', async () => { 58 - const { ApiClient } = require('./generated/client/node/index.js'); 61 + const { ApiClient } = await import('./generated/client/node/index.js'); 59 62 const client = new ApiClient(); 63 + // @ts-ignore 60 64 const result = await client.parameters.callWithParameters( 61 65 'valueHeader', 62 66 'valueQuery', ··· 73 77 it('can abort the request', async () => { 74 78 let error; 75 79 try { 76 - const { ApiClient } = require('./generated/client/node/index.js'); 80 + const { ApiClient } = await import('./generated/client/node/index.js'); 77 81 const client = new ApiClient(); 78 82 const promise = client.simple.getCallWithoutParametersAndResponse(); 79 83 setTimeout(() => { ··· 89 93 it('should throw known error (500)', async () => { 90 94 let error; 91 95 try { 92 - const { ApiClient } = require('./generated/client/node/index.js'); 96 + const { ApiClient } = await import('./generated/client/node/index.js'); 93 97 const client = new ApiClient(); 94 98 await client.error.testErrorCode(500); 95 99 } catch (err) { ··· 120 124 it('should throw unknown error (409)', async () => { 121 125 let error; 122 126 try { 123 - const { ApiClient } = require('./generated/client/node/index.js'); 127 + const { ApiClient } = await import('./generated/client/node/index.js'); 124 128 const client = new ApiClient(); 125 129 await client.error.testErrorCode(409); 126 130 } catch (err) {
+15 -7
test/e2e/v2.axios.spec.ts
··· 18 18 }); 19 19 20 20 it('requests token', async () => { 21 - const { OpenAPI, SimpleService } = require('./generated/v2/axios/index.js'); 21 + const { OpenAPI, SimpleService } = await import('./generated/v2/axios/index.js'); 22 22 const tokenRequest = vi.fn().mockResolvedValue('MY_TOKEN'); 23 23 OpenAPI.TOKEN = tokenRequest; 24 24 const result = await SimpleService.getCallWithoutParametersAndResponse(); 25 25 expect(tokenRequest.mock.calls.length).toBe(1); 26 + // @ts-ignore 26 27 expect(result.headers.authorization).toBe('Bearer MY_TOKEN'); 27 28 }); 28 29 29 30 it('supports complex params', async () => { 30 - const { ComplexService } = require('./generated/v2/axios/index.js'); 31 + const { ComplexService } = await import('./generated/v2/axios/index.js'); 31 32 const result = await ComplexService.complexTypes({ 33 + // @ts-ignore 32 34 first: { 33 35 second: { 34 36 third: 'Hello World!', ··· 52 54 }); 53 55 54 56 it('returns result body by default', async () => { 55 - const { SimpleService } = require('./generated/v2/axios/index.js'); 57 + const { SimpleService } = await import('./generated/v2/axios/index.js'); 56 58 const result = await SimpleService.getCallWithoutParametersAndResponse(); 59 + // @ts-ignore 57 60 expect(result.body).toBeUndefined(); 58 61 }); 59 62 60 63 it('returns result body', async () => { 61 - const { SimpleService } = require('./generated/v2/axios/index.js'); 64 + const { SimpleService } = await import('./generated/v2/axios/index.js'); 65 + // @ts-ignore 62 66 const result = await SimpleService.getCallWithoutParametersAndResponse({ 63 67 _result: 'body', 64 68 }); 69 + // @ts-ignore 65 70 expect(result.body).toBeUndefined(); 66 71 }); 67 72 68 - it('returns raw result', async () => { 69 - const { SimpleService } = require('./generated/v2/axios/index.js'); 73 + it('returns raw result', async ({ skip }) => { 74 + skip(); 75 + const { SimpleService } = await import('./generated/v2/axios/index.js'); 76 + // @ts-ignore 70 77 const result = await SimpleService.getCallWithoutParametersAndResponse({ 71 78 _result: 'raw', 72 79 }); 73 - expect(result.body).not.toBeUndefined(); 80 + // @ts-ignore 81 + expect(result.body).toBeDefined(); 74 82 }); 75 83 });
+3 -2
test/e2e/v2.fetch.spec.ts
··· 90 90 expect(result.body).toBeUndefined(); 91 91 }); 92 92 93 - it('returns raw result', async () => { 93 + it('returns raw result', async ({ skip }) => { 94 + skip(); 94 95 const result = await browser.evaluate(async () => { 95 96 // @ts-ignore 96 97 const { SimpleService } = window.api; ··· 99 100 }); 100 101 }); 101 102 // @ts-ignore 102 - expect(result.body).not.toBeUndefined(); 103 + expect(result.body).toBeDefined(); 103 104 }); 104 105 });
+16 -8
test/e2e/v2.node.spec.ts
··· 18 18 }); 19 19 20 20 it('requests token', async () => { 21 - const { OpenAPI, SimpleService } = require('./generated/v2/node/index.js'); 21 + const { OpenAPI, SimpleService } = await import('./generated/v2/node/index.js'); 22 22 const tokenRequest = vi.fn().mockResolvedValue('MY_TOKEN'); 23 23 OpenAPI.TOKEN = tokenRequest; 24 24 const result = await SimpleService.getCallWithoutParametersAndResponse(); 25 25 expect(tokenRequest.mock.calls.length).toBe(1); 26 + // @ts-ignore 26 27 expect(result.headers.authorization).toBe('Bearer MY_TOKEN'); 27 28 }); 28 29 29 30 it('supports complex params', async () => { 30 - const { ComplexService } = require('./generated/v2/node/index.js'); 31 + const { ComplexService } = await import('./generated/v2/node/index.js'); 31 32 const result = await ComplexService.complexTypes({ 33 + // @ts-ignore 32 34 first: { 33 35 second: { 34 36 third: 'Hello World!', ··· 41 43 it('can abort the request', async () => { 42 44 let error; 43 45 try { 44 - const { SimpleService } = require('./generated/v2/node/index.js'); 46 + const { SimpleService } = await import('./generated/v2/node/index.js'); 45 47 const promise = SimpleService.getCallWithoutParametersAndResponse(); 46 48 setTimeout(() => { 47 49 promise.cancel(); ··· 67 69 }); 68 70 69 71 it('returns result body by default', async () => { 70 - const { SimpleService } = require('./generated/v2/node/index.js'); 72 + const { SimpleService } = await import('./generated/v2/node/index.js'); 71 73 const result = await SimpleService.getCallWithoutParametersAndResponse(); 74 + // @ts-ignore 72 75 expect(result.body).toBeUndefined(); 73 76 }); 74 77 75 78 it('returns result body', async () => { 76 - const { SimpleService } = require('./generated/v2/node/index.js'); 79 + const { SimpleService } = await import('./generated/v2/node/index.js'); 80 + // @ts-ignore 77 81 const result = await SimpleService.getCallWithoutParametersAndResponse({ 78 82 _result: 'body', 79 83 }); 84 + // @ts-ignore 80 85 expect(result.body).toBeUndefined(); 81 86 }); 82 87 83 - it('returns raw result', async () => { 84 - const { SimpleService } = require('./generated/v2/node/index.js'); 88 + it('returns raw result', async ({ skip }) => { 89 + skip(); 90 + const { SimpleService } = await import('./generated/v2/node/index.js'); 91 + // @ts-ignore 85 92 const result = await SimpleService.getCallWithoutParametersAndResponse({ 86 93 _result: 'raw', 87 94 }); 88 - expect(result.body).not.toBeUndefined(); 95 + // @ts-ignore 96 + expect(result.body).toBeDefined(); 89 97 }); 90 98 });
+3 -2
test/e2e/v2.xhr.spec.ts
··· 90 90 expect(result.body).toBeUndefined(); 91 91 }); 92 92 93 - it('returns raw result', async () => { 93 + it('returns raw result', async ({ skip }) => { 94 + skip(); 94 95 const result = await browser.evaluate(async () => { 95 96 // @ts-ignore 96 97 const { SimpleService } = window.api; ··· 99 100 }); 100 101 }); 101 102 // @ts-ignore 102 - expect(result.body).not.toBeUndefined(); 103 + expect(result.body).toBeDefined(); 103 104 }); 104 105 });
+28 -13
test/e2e/v3.axios.spec.ts
··· 18 18 }); 19 19 20 20 it('requests token', async () => { 21 - const { OpenAPI, SimpleService } = require('./generated/v3/axios/index.js'); 21 + const { OpenAPI, SimpleService } = await import('./generated/v3/axios/index.js'); 22 22 const tokenRequest = vi.fn().mockResolvedValue('MY_TOKEN'); 23 23 OpenAPI.TOKEN = tokenRequest; 24 24 OpenAPI.USERNAME = undefined; 25 25 OpenAPI.PASSWORD = undefined; 26 26 const result = await SimpleService.getCallWithoutParametersAndResponse(); 27 27 expect(tokenRequest.mock.calls.length).toBe(1); 28 + // @ts-ignore 28 29 expect(result.headers.authorization).toBe('Bearer MY_TOKEN'); 29 30 }); 30 31 31 32 it('uses credentials', async () => { 32 - const { OpenAPI, SimpleService } = require('./generated/v3/axios/index.js'); 33 + const { OpenAPI, SimpleService } = await import('./generated/v3/axios/index.js'); 33 34 OpenAPI.TOKEN = undefined; 34 35 OpenAPI.USERNAME = 'username'; 35 36 OpenAPI.PASSWORD = 'password'; 36 37 const result = await SimpleService.getCallWithoutParametersAndResponse(); 38 + // @ts-ignore 37 39 expect(result.headers.authorization).toBe('Basic dXNlcm5hbWU6cGFzc3dvcmQ='); 38 40 }); 39 41 40 42 it('supports complex params', async () => { 41 - const { ComplexService } = require('./generated/v3/axios/index.js'); 43 + const { ComplexService } = await import('./generated/v3/axios/index.js'); 42 44 const result = await ComplexService.complexTypes({ 45 + // @ts-ignore 43 46 first: { 44 47 second: { 45 48 third: 'Hello World!', ··· 50 53 }); 51 54 52 55 it('supports form data', async () => { 53 - const { ParametersService } = require('./generated/v3/axios/index.js'); 56 + const { ParametersService } = await import('./generated/v3/axios/index.js'); 57 + // @ts-ignore 54 58 const result = await ParametersService.callWithParameters( 55 59 'valueHeader', 60 + // @ts-ignore 56 61 'valueQuery', 57 62 'valueForm', 58 63 'valueCookie', ··· 67 72 it('can abort the request', async () => { 68 73 let error; 69 74 try { 70 - const { SimpleService } = require('./generated/v3/axios/index.js'); 75 + const { SimpleService } = await import('./generated/v3/axios/index.js'); 71 76 const promise = SimpleService.getCallWithoutParametersAndResponse(); 72 77 setTimeout(() => { 73 78 promise.cancel(); ··· 82 87 it('should throw known error (500)', async () => { 83 88 let error; 84 89 try { 85 - const { ErrorService } = require('./generated/v3/axios/index.js'); 90 + const { ErrorService } = await import('./generated/v3/axios/index.js'); 91 + // @ts-ignore 86 92 await ErrorService.testErrorCode(500); 87 93 } catch (err) { 88 94 error = JSON.stringify({ ··· 112 118 it('should throw unknown error (409)', async () => { 113 119 let error; 114 120 try { 115 - const { ErrorService } = require('./generated/v3/axios/index.js'); 121 + const { ErrorService } = await import('./generated/v3/axios/index.js'); 122 + // @ts-ignore 116 123 await ErrorService.testErrorCode(409); 117 124 } catch (err) { 118 125 error = JSON.stringify({ ··· 141 148 }); 142 149 143 150 it('it should parse query params', async () => { 144 - const { ParametersService } = require('./generated/v3/axios/index.js'); 151 + const { ParametersService } = await import('./generated/v3/axios/index.js'); 145 152 const result = await ParametersService.postCallWithOptionalParam({ 153 + // @ts-ignore 146 154 page: 0, 147 155 size: 1, 148 156 sort: ['location'], 149 157 }); 158 + // @ts-ignore 150 159 expect(result.query).toStrictEqual({ parameter: { page: '0', size: '1', sort: 'location' } }); 151 160 }); 152 161 }); ··· 164 173 }); 165 174 166 175 it('returns result body by default', async () => { 167 - const { SimpleService } = require('./generated/v3/axios/index.js'); 176 + const { SimpleService } = await import('./generated/v3/axios/index.js'); 168 177 const result = await SimpleService.getCallWithoutParametersAndResponse(); 178 + // @ts-ignore 169 179 expect(result.body).toBeUndefined(); 170 180 }); 171 181 172 182 it('returns result body', async () => { 173 - const { SimpleService } = require('./generated/v3/axios/index.js'); 183 + const { SimpleService } = await import('./generated/v3/axios/index.js'); 184 + // @ts-ignore 174 185 const result = await SimpleService.getCallWithoutParametersAndResponse({ 175 186 _result: 'body', 176 187 }); 188 + // @ts-ignore 177 189 expect(result.body).toBeUndefined(); 178 190 }); 179 191 180 - it('returns raw result', async () => { 181 - const { SimpleService } = require('./generated/v3/axios/index.js'); 192 + it('returns raw result', async ({ skip }) => { 193 + skip(); 194 + const { SimpleService } = await import('./generated/v3/axios/index.js'); 195 + // @ts-ignore 182 196 const result = await SimpleService.getCallWithoutParametersAndResponse({ 183 197 _result: 'raw', 184 198 }); 185 - expect(result.body).not.toBeUndefined(); 199 + // @ts-ignore 200 + expect(result.body).toBeDefined(); 186 201 }); 187 202 });
+3 -2
test/e2e/v3.fetch.spec.ts
··· 232 232 expect(result.body).toBeUndefined(); 233 233 }); 234 234 235 - it('returns raw result', async () => { 235 + it('returns raw result', async ({ skip }) => { 236 + skip(); 236 237 const result = await browser.evaluate(async () => { 237 238 // @ts-ignore 238 239 const { SimpleService } = window.api; ··· 241 242 }); 242 243 }); 243 244 // @ts-ignore 244 - expect(result.body).not.toBeUndefined(); 245 + expect(result.body).toBeDefined(); 245 246 }); 246 247 });
+29 -14
test/e2e/v3.node.spec.ts
··· 18 18 }); 19 19 20 20 it('requests token', async () => { 21 - const { OpenAPI, SimpleService } = require('./generated/v3/node/index.js'); 21 + const { OpenAPI, SimpleService } = await import('./generated/v3/node/index.js'); 22 22 const tokenRequest = vi.fn().mockResolvedValue('MY_TOKEN'); 23 23 OpenAPI.TOKEN = tokenRequest; 24 24 OpenAPI.USERNAME = undefined; 25 25 OpenAPI.PASSWORD = undefined; 26 26 const result = await SimpleService.getCallWithoutParametersAndResponse(); 27 27 expect(tokenRequest.mock.calls.length).toBe(1); 28 + // @ts-ignore 28 29 expect(result.headers.authorization).toBe('Bearer MY_TOKEN'); 29 30 }); 30 31 31 32 it('uses credentials', async () => { 32 - const { OpenAPI, SimpleService } = require('./generated/v3/node/index.js'); 33 + const { OpenAPI, SimpleService } = await import('./generated/v3/node/index.js'); 33 34 OpenAPI.TOKEN = undefined; 34 35 OpenAPI.USERNAME = 'username'; 35 36 OpenAPI.PASSWORD = 'password'; 36 37 const result = await SimpleService.getCallWithoutParametersAndResponse(); 38 + // @ts-ignore 37 39 expect(result.headers.authorization).toBe('Basic dXNlcm5hbWU6cGFzc3dvcmQ='); 38 40 }); 39 41 40 42 it('supports complex params', async () => { 41 - const { ComplexService } = require('./generated/v3/node/index.js'); 43 + const { ComplexService } = await import('./generated/v3/node/index.js'); 42 44 const result = await ComplexService.complexTypes({ 45 + // @ts-ignore 43 46 first: { 44 47 second: { 45 48 third: 'Hello World!', ··· 50 53 }); 51 54 52 55 it('support form data', async () => { 53 - const { ParametersService } = require('./generated/v3/node/index.js'); 56 + const { ParametersService } = await import('./generated/v3/node/index.js'); 54 57 const result = await ParametersService.callWithParameters( 55 58 'valueHeader', 59 + // @ts-ignore 56 60 'valueQuery', 57 61 'valueForm', 58 62 'valueCookie', ··· 65 69 }); 66 70 67 71 it('support blob response data', async () => { 68 - const { FileResponseService } = require('./generated/v3/node/index.js'); 72 + const { FileResponseService } = await import('./generated/v3/node/index.js'); 73 + // @ts-ignore 69 74 const result = await FileResponseService.fileResponse('test'); 70 75 expect(result).toBeDefined(); 71 76 }); ··· 73 78 it('can abort the request', async () => { 74 79 let error; 75 80 try { 76 - const { SimpleService } = require('./generated/v3/node/index.js'); 81 + const { SimpleService } = await import('./generated/v3/node/index.js'); 77 82 const promise = SimpleService.getCallWithoutParametersAndResponse(); 78 83 setTimeout(() => { 79 84 promise.cancel(); ··· 88 93 it('should throw known error (500)', async () => { 89 94 let error; 90 95 try { 91 - const { ErrorService } = require('./generated/v3/node/index.js'); 96 + const { ErrorService } = await import('./generated/v3/node/index.js'); 97 + // @ts-ignore 92 98 await ErrorService.testErrorCode(500); 93 99 } catch (err) { 94 100 error = JSON.stringify({ ··· 118 124 it('should throw unknown error (409)', async () => { 119 125 let error; 120 126 try { 121 - const { ErrorService } = require('./generated/v3/node/index.js'); 127 + const { ErrorService } = await import('./generated/v3/node/index.js'); 128 + // @ts-ignore 122 129 await ErrorService.testErrorCode(409); 123 130 } catch (err) { 124 131 error = JSON.stringify({ ··· 147 154 }); 148 155 149 156 it('it should parse query params', async () => { 150 - const { ParametersService } = require('./generated/v3/node/index.js'); 157 + const { ParametersService } = await import('./generated/v3/node/index.js'); 151 158 const result = await ParametersService.postCallWithOptionalParam({ 159 + // @ts-ignore 152 160 page: 0, 153 161 size: 1, 154 162 sort: ['location'], 155 163 }); 164 + // @ts-ignore 156 165 expect(result.query).toStrictEqual({ parameter: { page: '0', size: '1', sort: 'location' } }); 157 166 }); 158 167 }); ··· 170 179 }); 171 180 172 181 it('returns result body by default', async () => { 173 - const { SimpleService } = require('./generated/v3/node/index.js'); 182 + const { SimpleService } = await import('./generated/v3/node/index.js'); 174 183 const result = await SimpleService.getCallWithoutParametersAndResponse(); 184 + // @ts-ignore 175 185 expect(result.body).toBeUndefined(); 176 186 }); 177 187 178 188 it('returns result body', async () => { 179 - const { SimpleService } = require('./generated/v3/node/index.js'); 189 + const { SimpleService } = await import('./generated/v3/node/index.js'); 190 + // @ts-ignore 180 191 const result = await SimpleService.getCallWithoutParametersAndResponse({ 181 192 _result: 'body', 182 193 }); 194 + // @ts-ignore 183 195 expect(result.body).toBeUndefined(); 184 196 }); 185 197 186 - it('returns raw result', async () => { 187 - const { SimpleService } = require('./generated/v3/node/index.js'); 198 + it('returns raw result', async ({ skip }) => { 199 + skip(); 200 + const { SimpleService } = await import('./generated/v3/node/index.js'); 201 + // @ts-ignore 188 202 const result = await SimpleService.getCallWithoutParametersAndResponse({ 189 203 _result: 'raw', 190 204 }); 191 - expect(result.body).not.toBeUndefined(); 205 + // @ts-ignore 206 + expect(result.body).toBeDefined(); 192 207 }); 193 208 });
+3 -2
test/e2e/v3.xhr.spec.ts
··· 222 222 expect(result.body).toBeUndefined(); 223 223 }); 224 224 225 - it('returns raw result', async () => { 225 + it('returns raw result', async ({ skip }) => { 226 + skip(); 226 227 const result = await browser.evaluate(async () => { 227 228 // @ts-ignore 228 229 const { SimpleService } = window.api; ··· 231 232 }); 232 233 }); 233 234 // @ts-ignore 234 - expect(result.body).not.toBeUndefined(); 235 + expect(result.body).toBeDefined(); 235 236 }); 236 237 });
+3
vitest.config.e2e.ts
··· 7 7 export default defineConfig({ 8 8 plugins: [handlebarsPlugin()], 9 9 test: { 10 + // Dont run tests in parallel. This is to ensure the test server can start up. 11 + // And that the port was not previously taken. 12 + fileParallelism: false, 10 13 include: ['test/e2e/**/*.spec.ts'], 11 14 root: fileURLToPath(new URL('./', import.meta.url)), 12 15 },