From e69e8a5346e5d488cf09ad3f63f17adf7fe324eb Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Tue, 8 Oct 2024 14:34:02 +0200 Subject: [PATCH] fix(ruby): only prefix model by client:: --- templates/ruby/api.mustache | 2 +- tests/CTS/requests/search/getObject.json | 24 +++++ tests/output/javascript/yarn.lock | 121 ++++++++++++----------- tests/output/python/tests/helpers.py | 2 + 4 files changed, 92 insertions(+), 57 deletions(-) diff --git a/templates/ruby/api.mustache b/templates/ruby/api.mustache index 61d8a9f8fa8..a1d2bf5f57c 100644 --- a/templates/ruby/api.mustache +++ b/templates/ruby/api.mustache @@ -225,7 +225,7 @@ module {{moduleName}} # @return [{{{returnType}}}{{^returnType}}nil{{/returnType}}] def {{operationId}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{^required}}{{paramName}}=nil, {{/required}}{{/allParams}}request_options = {}) {{#returnType}}response = {{/returnType}}{{operationId}}_with_http_info({{#allParams}}{{paramName}}, {{/allParams}}request_options) - {{#returnType}}@api_client.deserialize(response.body, request_options[:debug_return_type]{{#vendorExtensions}}{{#returnProperty}} || '{{#isArray}}Array<{{{modelModule}}}::{{complexType}}>{{/isArray}}{{^isArray}}{{^x-is-custom-request}}{{{modelModule}}}::{{/x-is-custom-request}}{{{dataType}}}{{/isArray}}'{{/returnProperty}}{{/vendorExtensions}}){{/returnType}}{{^returnType}}nil{{/returnType}} + {{#returnType}}@api_client.deserialize(response.body, request_options[:debug_return_type]{{#vendorExtensions}}{{#returnProperty}} || '{{#isArray}}Array<{{{modelModule}}}::{{complexType}}>{{/isArray}}{{^isArray}}{{^isPrimitiveType}}{{^isMap}}{{{modelModule}}}::{{/isMap}}{{/isPrimitiveType}}{{{dataType}}}{{/isArray}}'{{/returnProperty}}{{/vendorExtensions}}){{/returnType}}{{^returnType}}nil{{/returnType}} end {{^-last}} diff --git a/tests/CTS/requests/search/getObject.json b/tests/CTS/requests/search/getObject.json index 82fb717fdc9..4a0dc4dcad0 100644 --- a/tests/CTS/requests/search/getObject.json +++ b/tests/CTS/requests/search/getObject.json @@ -15,5 +15,29 @@ "attributesToRetrieve": "attr1%2Cattr2" } } + }, + { + "testName": "search with a real object", + "parameters": { + "indexName": "cts_e2e_browse", + "objectID": "Batman and Robin" + }, + "request": { + "path": "/1/indexes/cts_e2e_browse/Batman%20and%20Robin", + "method": "GET" + }, + "response": { + "statusCode": 200, + "body": { + "objectID": "Batman and Robin", + "title": "Batman and Robin", + "year": 1949, + "cast": [ + "Robert Lowery", + "Johnny Duncan", + "Jane Adams" + ] + } + } } ] diff --git a/tests/output/javascript/yarn.lock b/tests/output/javascript/yarn.lock index 7deef847193..6eda661c23f 100644 --- a/tests/output/javascript/yarn.lock +++ b/tests/output/javascript/yarn.lock @@ -408,36 +408,36 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:22.5.5": - version: 22.5.5 - resolution: "@types/node@npm:22.5.5" +"@types/node@npm:22.7.4": + version: 22.7.4 + resolution: "@types/node@npm:22.7.4" dependencies: undici-types: "npm:~6.19.2" - checksum: 10/172d02c8e6d921699edcf559c28b3805616bd6481af1b3cb0299f89ad9a6f33b71050434c06ce7b503166054a26275344187c443f99f745d0b12601372452f19 + checksum: 10/19ddab80c4eba2253c855ed67c9bbc47417183049d01e59010a738bd80d47338bab79fd1f44ae51516bd63a1db4bf21ddb38b16bf6401a2e93252068ec52e88b languageName: node linkType: hard -"@vitest/expect@npm:2.1.1": - version: 2.1.1 - resolution: "@vitest/expect@npm:2.1.1" +"@vitest/expect@npm:2.1.2": + version: 2.1.2 + resolution: "@vitest/expect@npm:2.1.2" dependencies: - "@vitest/spy": "npm:2.1.1" - "@vitest/utils": "npm:2.1.1" + "@vitest/spy": "npm:2.1.2" + "@vitest/utils": "npm:2.1.2" chai: "npm:^5.1.1" tinyrainbow: "npm:^1.2.0" - checksum: 10/ece8d7f9e0c083c5cf30c0df9e052bba4402649736293a18e56a8db4be46a847b18dc7b33cdd1c08bea51bf6f2cb021e40e7227d9cfc24fdba4a955bffe371a2 + checksum: 10/0e2991295a6b9c51e2d074d1185317dcb2d85d1e9b5045299431fd7b84e51a847942911b08efad2379f56bb4dfe2f02442abd267df348751c61c86bc7b3154a3 languageName: node linkType: hard -"@vitest/mocker@npm:2.1.1": - version: 2.1.1 - resolution: "@vitest/mocker@npm:2.1.1" +"@vitest/mocker@npm:2.1.2": + version: 2.1.2 + resolution: "@vitest/mocker@npm:2.1.2" dependencies: "@vitest/spy": "npm:^2.1.0-beta.1" estree-walker: "npm:^3.0.3" magic-string: "npm:^0.30.11" peerDependencies: - "@vitest/spy": 2.1.1 + "@vitest/spy": 2.1.2 msw: ^2.3.5 vite: ^5.0.0 peerDependenciesMeta: @@ -445,41 +445,50 @@ __metadata: optional: true vite: optional: true - checksum: 10/4fbdaac36e3f603235b131e25d9e561381bd989a34e49522e16652077021532ae6653907b47bbca93c14ae4629e3e6a8f61438e3812620dc5654b61595b45208 + checksum: 10/f6ec9aa061c21877322bf3f0b12bf4e78eba3f092174a506b2d2d479b78e36b4d46a6458cd23d3bf3cbdcf212276cf5d1a87234ae2014e8362ea2afc23e46bec languageName: node linkType: hard -"@vitest/pretty-format@npm:2.1.1, @vitest/pretty-format@npm:^2.1.1": - version: 2.1.1 - resolution: "@vitest/pretty-format@npm:2.1.1" +"@vitest/pretty-format@npm:2.1.2, @vitest/pretty-format@npm:^2.1.2": + version: 2.1.2 + resolution: "@vitest/pretty-format@npm:2.1.2" dependencies: tinyrainbow: "npm:^1.2.0" - checksum: 10/744278a3a91d080e51a94b03eaf7cf43779978d6391060cbfdda6d03194eef744ce8f12a2fe2fa90a9bf9b9f038d4c4c4d88f6192f042c88c5ee4125f38bf892 + checksum: 10/5866fb3c45e794b695a9f62f76b886a8a8d07d711f7187e9e769fd614bc62df1f87d076880c032d5cd8c0272c385fe824c12191b04a3ca44a8bb9fed1a0c3693 languageName: node linkType: hard -"@vitest/runner@npm:2.1.1": - version: 2.1.1 - resolution: "@vitest/runner@npm:2.1.1" +"@vitest/runner@npm:2.1.2": + version: 2.1.2 + resolution: "@vitest/runner@npm:2.1.2" dependencies: - "@vitest/utils": "npm:2.1.1" + "@vitest/utils": "npm:2.1.2" pathe: "npm:^1.1.2" - checksum: 10/cf13a2f0bebb494484e60614ff0e7cab06f4310b36c96fe311035ab2eec9cbc057fa5702e904d43e8976fb2214fe550286ceb0b3dc1c72081e23eb1b1f8fa193 + checksum: 10/60b086e39a31dd664875746b0da3a2402d4088801306e87fe25f20dc660abda50afd3e5ec6ea34ef0849f5652ac05ce2a93a13ea4d5dd16a549d9882941de328 languageName: node linkType: hard -"@vitest/snapshot@npm:2.1.1": - version: 2.1.1 - resolution: "@vitest/snapshot@npm:2.1.1" +"@vitest/snapshot@npm:2.1.2": + version: 2.1.2 + resolution: "@vitest/snapshot@npm:2.1.2" dependencies: - "@vitest/pretty-format": "npm:2.1.1" + "@vitest/pretty-format": "npm:2.1.2" magic-string: "npm:^0.30.11" pathe: "npm:^1.1.2" - checksum: 10/820f429d950cf63316464e7f2bc1f0ba4b7d2691c51f6ad03ba1c6edc7dbdc6a86b017c082f2a519b743ae53880b41366bbb596c8b43cf8cd68032f9433ec844 + checksum: 10/acd29f59883899c660eeba5950366e4f9f799cb29e7edd65575a7b6ad319a1df4d7a46a95048f8f9475f4c6f46cea198a7ecfab06e88e435dfd4989b365b917f + languageName: node + linkType: hard + +"@vitest/spy@npm:2.1.2": + version: 2.1.2 + resolution: "@vitest/spy@npm:2.1.2" + dependencies: + tinyspy: "npm:^3.0.0" + checksum: 10/0183ab53b431bd6a08531752113780e15202ebd7579eed25b9bf87c849f75d74d0e4f346d886034cd9dd1381aa8814b3e468f141f41f7539b75f30268df35a79 languageName: node linkType: hard -"@vitest/spy@npm:2.1.1, @vitest/spy@npm:^2.1.0-beta.1": +"@vitest/spy@npm:^2.1.0-beta.1": version: 2.1.1 resolution: "@vitest/spy@npm:2.1.1" dependencies: @@ -488,14 +497,14 @@ __metadata: languageName: node linkType: hard -"@vitest/utils@npm:2.1.1": - version: 2.1.1 - resolution: "@vitest/utils@npm:2.1.1" +"@vitest/utils@npm:2.1.2": + version: 2.1.2 + resolution: "@vitest/utils@npm:2.1.2" dependencies: - "@vitest/pretty-format": "npm:2.1.1" + "@vitest/pretty-format": "npm:2.1.2" loupe: "npm:^3.1.1" tinyrainbow: "npm:^1.2.0" - checksum: 10/605f1807c343ac01cde053b062bda8f0cc51b321a3cd9c751424a1e24549a35120896bd58612a14f068460242013f69e08fc0a69355387e981a5a50bce9ae04e + checksum: 10/fa898ea6312cb62e4027f55b06859d84ba50ac20e583bab2889eeadea41d73baf6022ed87547deec6251cd8021f1df13d2ea4515ab253582c3ca93226acd6313 languageName: node linkType: hard @@ -1031,11 +1040,11 @@ __metadata: "@algolia/monitoring": "link:../../../clients/algoliasearch-client-javascript/packages/monitoring" "@algolia/recommend": "link:../../../clients/algoliasearch-client-javascript/packages/recommend" "@algolia/requester-testing": "link:../../../clients/algoliasearch-client-javascript/packages/requester-testing" - "@types/node": "npm:22.5.5" + "@types/node": "npm:22.7.4" algoliasearch: "link:../../../clients/algoliasearch-client-javascript/packages/algoliasearch" dotenv: "npm:16.4.5" typescript: "npm:5.6.2" - vitest: "npm:2.1.1" + vitest: "npm:2.1.2" languageName: unknown linkType: soft @@ -1644,9 +1653,9 @@ __metadata: languageName: node linkType: hard -"vite-node@npm:2.1.1": - version: 2.1.1 - resolution: "vite-node@npm:2.1.1" +"vite-node@npm:2.1.2": + version: 2.1.2 + resolution: "vite-node@npm:2.1.2" dependencies: cac: "npm:^6.7.14" debug: "npm:^4.3.6" @@ -1654,7 +1663,7 @@ __metadata: vite: "npm:^5.0.0" bin: vite-node: vite-node.mjs - checksum: 10/c21892b560cad87414ef774d7e53b207e8d66b511b7ef085940fd2f2160d8f6c42dfa9af2ef5465e775b767fc3312ec5b3418b898041f592b8e0b093b4b7110a + checksum: 10/582843800ee968e7edf2cf6e6f1573634122cba74e47ef531a373337f6084c4a394c3c1c2abb210c178c8671200530412c09f5cc2f02a4519f0045a03c3eed02 languageName: node linkType: hard @@ -1701,17 +1710,17 @@ __metadata: languageName: node linkType: hard -"vitest@npm:2.1.1": - version: 2.1.1 - resolution: "vitest@npm:2.1.1" - dependencies: - "@vitest/expect": "npm:2.1.1" - "@vitest/mocker": "npm:2.1.1" - "@vitest/pretty-format": "npm:^2.1.1" - "@vitest/runner": "npm:2.1.1" - "@vitest/snapshot": "npm:2.1.1" - "@vitest/spy": "npm:2.1.1" - "@vitest/utils": "npm:2.1.1" +"vitest@npm:2.1.2": + version: 2.1.2 + resolution: "vitest@npm:2.1.2" + dependencies: + "@vitest/expect": "npm:2.1.2" + "@vitest/mocker": "npm:2.1.2" + "@vitest/pretty-format": "npm:^2.1.2" + "@vitest/runner": "npm:2.1.2" + "@vitest/snapshot": "npm:2.1.2" + "@vitest/spy": "npm:2.1.2" + "@vitest/utils": "npm:2.1.2" chai: "npm:^5.1.1" debug: "npm:^4.3.6" magic-string: "npm:^0.30.11" @@ -1722,13 +1731,13 @@ __metadata: tinypool: "npm:^1.0.0" tinyrainbow: "npm:^1.2.0" vite: "npm:^5.0.0" - vite-node: "npm:2.1.1" + vite-node: "npm:2.1.2" why-is-node-running: "npm:^2.3.0" peerDependencies: "@edge-runtime/vm": "*" "@types/node": ^18.0.0 || >=20.0.0 - "@vitest/browser": 2.1.1 - "@vitest/ui": 2.1.1 + "@vitest/browser": 2.1.2 + "@vitest/ui": 2.1.2 happy-dom: "*" jsdom: "*" peerDependenciesMeta: @@ -1746,7 +1755,7 @@ __metadata: optional: true bin: vitest: vitest.mjs - checksum: 10/5bbbc7298a043c7ca0914817a2c30e18af5a1619f4a750d36056f64f4d907a1fad50b8bab93aaf39f8174eb475108c9287f6e226e24d3a3ccd6f0b71d3f56438 + checksum: 10/3a331a10499f5ed678530594903869e37a0de548598bcf540db9a6e015bb7a38f36c3585376b3aeeb53fee6b20d75b93081f32b1ea09fd8c2098aa541af28491 languageName: node linkType: hard diff --git a/tests/output/python/tests/helpers.py b/tests/output/python/tests/helpers.py index de2d1cd09a5..7678c0d97c2 100644 --- a/tests/output/python/tests/helpers.py +++ b/tests/output/python/tests/helpers.py @@ -6,6 +6,8 @@ def unwrap(self, resp): for _, r in enumerate(resp): _res.append(r.to_dict()) return _res + if isinstance(resp, dict): + return resp return resp.to_dict() def union(self, expected, received):