Skip to content

Commit 88ff534

Browse files
millotpmillotp
authored
Merge 53e3435 into 9f21816 
2 parents 9f21816 + 53e3435 commit 88ff534

28 files changed

+78
-36
lines changed

‎generators/src/main/java/com/algolia/codegen/cts/lambda/DynamicSnippetLambda.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio
7676
Map<String, Object> context = (Map<String, Object>) fragment.context();
7777
snippet.addMethodCall(context, paramsType, operation);
7878

79-
writer.write(adaptor.compileTemplate(executor, context, "tests/client/method.mustache"));
79+
writer.write(adaptor.compileTemplate(executor, context, "tests/method.mustache"));
8080
}
8181
}

‎generators/src/main/java/com/algolia/codegen/cts/manager/CSharpCTSManager.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
2929
@Override
3030
public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
3131
supportingFiles.add(new SupportingFile("snippets/src.csproj.mustache", output + "/csharp/src/src.csproj"));
32-
supportingFiles.add(new SupportingFile("snippets/Program.mustache", output + "/csharp/src/Program.cs"));
3332
supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", output + "/csharp/.gitignore"));
3433
supportingFiles.add(new SupportingFile("snippets/Algolia.mustache", output + "/csharp/Algolia.sln"));
3534
supportingFiles.add(new SupportingFile("snippets/dotnet-tools.mustache", output + "/csharp/.config/dotnet-tools.json"));
35+
36+
if (output.equals("snippets")) {
37+
supportingFiles.add(new SupportingFile("snippets/Program.mustache", output + "/csharp/src/Program.cs"));
38+
}
3639
}
3740

3841
@Override

‎generators/src/main/java/com/algolia/codegen/cts/manager/JavaCTSManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
3838

3939
@Override
4040
public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
41-
supportingFiles.add(new SupportingFile("tests/build.mustache", output + "/java", "build.gradle"));
41+
supportingFiles.add(new SupportingFile("snippets/build.mustache", output + "/java", "build.gradle"));
4242
supportingFiles.add(new SupportingFile("snippets/settings.mustache", output + "/java", "settings.gradle"));
4343
}
4444

‎generators/src/main/java/com/algolia/codegen/cts/tests/ParametersWithDataType.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,16 @@ public void enhanceParameters(Map<String, Object> parameters, Map<String, Object
9595
}
9696

9797
// Give the stringified version to mustache, for js
98-
bundle.put("parameters", Json.mapper().writeValueAsString(parameters));
98+
bundle.put("parameters", toJSONWithVar(parameters));
9999
bundle.put("parametersWithDataType", parametersWithDataType);
100100
// Also provide a map version for those who know which keys to look for
101101
bundle.put("parametersWithDataTypeMap", parametersWithDataTypeMap);
102102
}
103103

104+
private String toJSONWithVar(Map<String, Object> parameters) throws JsonProcessingException {
105+
return Json.mapper().writeValueAsString(parameters).replaceAll("\"\\$var: (.*?)\"", "$1");
106+
}
107+
104108
private Map<String, Object> traverseParams(
105109
String paramName,
106110
Object param,
@@ -154,6 +158,10 @@ private Map<String, Object> traverseParams(
154158

155159
if (param == null) {
156160
handleNull(spec, testOutput);
161+
} else if (param instanceof String && ((String) param).startsWith("$var: ")) {
162+
// bypass for verbatim variables used in the guides, we don't need to do any validation
163+
testOutput.put("isVerbatim", true);
164+
testOutput.put("value", ((String) param).substring(6));
157165
} else if (spec.getIsArray()) {
158166
handleArray(paramName, param, testOutput, spec, depth);
159167
} else if (spec.getIsEnum()) {
@@ -196,6 +204,10 @@ private Map<String, Object> traverseParamsWithoutSpec(String paramName, Object p
196204

197205
if (param == null) {
198206
handleNull(null, testOutput);
207+
} else if (param instanceof String && ((String) param).startsWith("$var: ")) {
208+
// bypass for verbatim variables used in the guides, we don't need to do any validation
209+
testOutput.put("isVerbatim", true);
210+
testOutput.put("value", ((String) param).substring(6));
199211
} else if (param instanceof List) {
200212
handleArray(paramName, param, testOutput, null, depth);
201213
} else if (param instanceof Map) {

‎generators/src/main/java/com/algolia/codegen/cts/tests/Snippet.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class Snippet {
1313

1414
public String testName;
1515
public boolean isSnippet;
16-
public boolean ignoreResponse;
1716

1817
public String method;
1918
public Map<String, Object> parameters;
@@ -34,7 +33,6 @@ public String toString() {
3433
sb.append("class Request {\n");
3534
sb.append(" testName: ").append(testName).append("\n");
3635
sb.append(" isSnippet").append(isSnippet).append("\n");
37-
sb.append(" ignoreResponse").append(ignoreResponse).append("\n");
3836
sb.append(" method: ").append(method).append("\n");
3937
sb.append(" parameters: ").append(parameters).append("\n");
4038
sb.append(" requestOptions: ").append(requestOptions).append("\n");
@@ -75,13 +73,10 @@ public void addMethodCall(Map<String, Object> context, ParametersWithDataType pa
7573

7674
// Determines whether the endpoint is expected to return a response payload deserialized
7775
// and therefore a variable to store it into.
78-
if (!ignoreResponse) {
79-
context.put("hasResponse", true);
80-
81-
for (CodegenResponse response : ope.responses) {
82-
if (response.code.equals("204")) {
83-
context.put("hasResponse", false);
84-
}
76+
context.put("hasResponse", true);
77+
for (CodegenResponse response : ope.responses) {
78+
if (response.code.equals("204")) {
79+
context.put("hasResponse", false);
8580
}
8681
}
8782

‎generators/src/main/java/com/algolia/codegen/cts/tests/TestsRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
8282
ParametersWithDataType paramsType = new ParametersWithDataType(models, language, client, false);
8383

8484
bundle.put("e2eApiKey", client.equals("monitoring") ? "MONITORING_API_KEY" : "ALGOLIA_ADMIN_KEY");
85+
bundle.put("useEchoRequester", true);
8586

8687
for (Map.Entry<String, CodegenOperation> entry : operations.entrySet()) {
8788
String operationId = entry.getKey();

‎scripts/buildLanguages.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B
2424
}
2525
break;
2626
case 'go':
27-
await run('go build ./...', { cwd, language });
27+
await run('go build -o /dev/null ./...', { cwd, language });
2828
break;
2929
case 'javascript':
3030
await run('YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install', { cwd, language });
@@ -42,7 +42,10 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B
4242
break;
4343
case 'java':
4444
case 'kotlin':
45-
await run(`./gradle/gradlew -p ${cwd} assemble`, { language });
45+
await run(
46+
`./gradle/gradlew -p ${cwd} ${buildType === 'client' || buildType === 'playground' ? 'assemble' : 'build'}`,
47+
{ language },
48+
);
4649
break;
4750
case 'php':
4851
// await runComposerInstall();

‎templates/csharp/tests/generateInnerParams.mustache

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{{#isNull}}
22
null
33
{{/isNull}}
4+
{{#isVerbatim}}
5+
{{{value}}}
6+
{{/isVerbatim}}
47
{{#isString}}
58
"{{#lambda.escapeQuotes}}{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}{{/lambda.escapeQuotes}}"
69
{{/isString}}

‎templates/dart/tests/param_value.mustache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{{#isNull}}empty(){{/isNull}}
2+
{{#isVerbatim}}{{{value}}}{{/isVerbatim}}
23
{{#isString}}"{{#lambda.escapeDollar}}{{{value}}}{{/lambda.escapeDollar}}"{{/isString}}
34
{{#isNumber}}{{{value}}}{{/isNumber}}
45
{{#isBoolean}}{{{value}}}{{/isBoolean}}

‎templates/go/tests/generateInnerParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
{{#isHelper}}{{#goFunctionalParam}}{{clientPrefix}}.With{{#lambda.pascalcase}}{{key}}{{/lambda.pascalcase}}({{/goFunctionalParam}}{{/isHelper}}{{#isNull}}{{#inClientTest}}tests.ZeroValue[{{#isNullObject}}*{{clientPrefix}}.{{/isNullObject}}{{objectName}}](){{/inClientTest}}{{^inClientTest}}nil{{/inClientTest}}{{/isNull}}{{#isString}}"{{{value}}}"{{/isString}}{{#isInteger}}{{{value}}}{{/isInteger}}{{#isLong}}{{{value}}}{{/isLong}}{{#isDouble}}{{{value}}}{{/isDouble}}{{#isBoolean}}{{{value}}}{{/isBoolean}}{{#isEnum}}{{clientPrefix}}.{{objectName}}("{{{value}}}"){{/isEnum}}{{#isArray}}
1+
{{#isVerbatim}}{{{value}}}{{/isVerbatim}}{{#isHelper}}{{#goFunctionalParam}}{{clientPrefix}}.With{{#lambda.pascalcase}}{{key}}{{/lambda.pascalcase}}({{/goFunctionalParam}}{{/isHelper}}{{#isNull}}{{#inClientTest}}tests.ZeroValue[{{#isNullObject}}*{{clientPrefix}}.{{/isNullObject}}{{objectName}}](){{/inClientTest}}{{^inClientTest}}nil{{/inClientTest}}{{/isNull}}{{#isString}}"{{{value}}}"{{/isString}}{{#isInteger}}{{{value}}}{{/isInteger}}{{#isLong}}{{{value}}}{{/isLong}}{{#isDouble}}{{{value}}}{{/isDouble}}{{#isBoolean}}{{{value}}}{{/isBoolean}}{{#isEnum}}{{clientPrefix}}.{{objectName}}("{{{value}}}"){{/isEnum}}{{#isArray}}
22
{{> tests/arrayType}}{{^value.isEmpty}}{ {{#value}}{{#isObject}}*{{/isObject}}{{#oneOfModel}}{{^isObject}}*{{/isObject}}{{/oneOfModel}}{{> tests/generateParams}},{{/value}} }{{/value.isEmpty}}{{/isArray}}{{#isObject}}
33
{{clientPrefix}}.NewEmpty{{objectName}}(){{#value}}{{#isAdditionalProperty}}.SetAdditionalProperty("{{{key}}}", {{> tests/generateParams}}){{/isAdditionalProperty}}{{^isAdditionalProperty}}.Set{{#lambda.pascalcase}}{{{key}}}{{/lambda.pascalcase}}({{> tests/generateParams}}){{/isAdditionalProperty}}{{/value}}{{/isObject}}{{#isFreeFormObject}}{{#isAnyType}}map[string]any{ {{#value}}{{#entrySet}}"{{{key}}}": "{{{value}}}",{{/entrySet}}{{/value}} }{{/isAnyType}}{{^isAnyType}}{{> tests/mapType}}{ {{#value}}"{{{key}}}": {{#oneOfModel}}{{^isObject}}*{{/isObject}}{{/oneOfModel}}{{#isObject}}*{{/isObject}}{{> tests/generateParams}},{{/value}} }{{/isAnyType}}{{/isFreeFormObject}}{{#isHelper}}{{#goFunctionalParam}}){{/goFunctionalParam}}{{/isHelper}}

‎templates/java/snippets/build.mustache

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
plugins {
2+
id 'java-library'
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
}
8+
9+
dependencies {
10+
testImplementation 'com.algolia:algoliasearch:{{packageVersion}}'
11+
}
12+
13+
java {
14+
toolchain {
15+
languageVersion = JavaLanguageVersion.of(17)
16+
vendor = JvmVendorSpec.ADOPTIUM
17+
}
18+
}
19+
20+
tasks.withType(JavaCompile) {
21+
options.encoding = 'UTF-8'
22+
}

‎templates/java/snippets/method.mustache

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ package com.algolia.methods.snippets;
44
{{> snippets/import}}
55
// IMPORT<
66

7+
import java.util.*;
8+
79
class Snippet{{client}} {
810
{{#blocksRequests}}
911
{{#snippets}}
1012
// Snippet for the {{method}} method.
1113
//
1214
// {{{description}}}
13-
void snippetFor{{#lambda.pascalcase}}{{method}}{{/lambda.pascalcase}}{{testIndex}}() {
15+
void snippetFor{{#lambda.pascalcase}}{{method}}{{/lambda.pascalcase}}{{testIndex}}() throws Exception {
1416
// >SEPARATOR {{method}} {{testName}}
1517
// Initialize the client
1618
{{> snippets/init}}

‎templates/java/tests/build.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ test() {
3333
events "passed", "skipped", "failed"
3434
showStandardStreams = true
3535
}
36-
}
36+
}

‎templates/javascript/guides/search/saveObjectsMovies.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Fetch and index objects in Algolia
66
const processRecords = async () => {
77
const datasetRequest = await fetch('https://dashboard.algolia.com/sample_datasets/movie.json');
8-
const objects = await datasetRequest.json();
8+
const movies = await datasetRequest.json();
99
return {{#dynamicSnippet}}saveObjectsMovies{{/dynamicSnippet}}
1010
};
1111

‎templates/kotlin/tests/param_value.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isNull}}empty(){{/isNull}}{{#isString}}{{#oneOfModel}}{{{parentClassName}}}.of("{{{value}}}"){{/oneOfModel}}{{^oneOfModel}}"{{#lambda.escapeQuotes}}{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}{{/lambda.escapeQuotes}}"{{/oneOfModel}}{{/isString}}{{#isInteger}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isInteger}}{{#isLong}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}L){{/oneOfModel}}{{^oneOfModel}}{{{value}}}L{{/oneOfModel}}{{/isLong}}{{#isDouble}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isDouble}}{{#isBoolean}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isBoolean}}{{#isEnum}}{{{objectName}}}.entries.first { it.value == "{{{value}}}" }{{/isEnum}}{{#isArray}}{{> tests/param_list}}{{/isArray}}{{#isObject}}{{> tests/param_object}}{{/isObject}}{{#isFreeFormObject}}{{#isSimpleObject}}{{> tests/param_json_object}}{{/isSimpleObject}}{{^isSimpleObject}}{{#isAnyType}}{{> tests/param_json_any}}{{/isAnyType}}{{^isAnyType}}{{> tests/param_map}}{{/isAnyType}}{{/isSimpleObject}}{{/isFreeFormObject}}
1+
{{#isNull}}empty(){{/isNull}}{{#isVerbatim}}{{{value}}}{{/isVerbatim}}{{#isString}}{{#oneOfModel}}{{{parentClassName}}}.of("{{{value}}}"){{/oneOfModel}}{{^oneOfModel}}"{{#lambda.escapeQuotes}}{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}{{/lambda.escapeQuotes}}"{{/oneOfModel}}{{/isString}}{{#isInteger}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isInteger}}{{#isLong}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}L){{/oneOfModel}}{{^oneOfModel}}{{{value}}}L{{/oneOfModel}}{{/isLong}}{{#isDouble}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isDouble}}{{#isBoolean}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isBoolean}}{{#isEnum}}{{{objectName}}}.entries.first { it.value == "{{{value}}}" }{{/isEnum}}{{#isArray}}{{> tests/param_list}}{{/isArray}}{{#isObject}}{{> tests/param_object}}{{/isObject}}{{#isFreeFormObject}}{{#isSimpleObject}}{{> tests/param_json_object}}{{/isSimpleObject}}{{^isSimpleObject}}{{#isAnyType}}{{> tests/param_json_any}}{{/isAnyType}}{{^isAnyType}}{{> tests/param_map}}{{/isAnyType}}{{/isSimpleObject}}{{/isFreeFormObject}}

‎templates/php/tests/generateParams.mustache

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
{{#isNull}}
33
null,
44
{{/isNull}}
5+
{{#isVerbatim}}
6+
{{{value}}}
7+
{{/isVerbatim}}
58
{{#isString}}
69
"{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}",
710
{{/isString}}

‎templates/python/tests/client/method.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{^isError}}{{#hasResponse}}_req = {{/hasResponse}}{{/isError}}{{^isSyncClient}}await {{/isSyncClient}}_client.{{#lambda.snakecase}}{{{method}}}{{/lambda.snakecase}}{{#useEchoRequester}}_with_http_info{{/useEchoRequester}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}} request_options={ {{#requestOptions.headers.parameters}}"headers":loads("""{{{.}}}"""),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}"query_parameters":loads("""{{{.}}}"""),{{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
1+
{{^isError}}{{#hasResponse}}_req = {{/hasResponse}}{{/isError}}{{> tests/method}}

‎templates/python/tests/generateInnerParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isNull}} None {{/isNull}} {{#isString}} "{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}" {{/isString}} {{#isInteger}} {{{value}}} {{/isInteger}} {{#isLong}} {{{value}}} {{/isLong}} {{#isDouble}} {{{value}}} {{/isDouble}} {{#isBoolean}} {{#lambda.titlecase}}{{{value}}}{{/lambda.titlecase}} {{/isBoolean}} {{#isEnum}} "{{{value}}}" {{/isEnum}} {{#isArray}} [ {{#value}}{{> tests/generateParams}}{{/value}} ] {{/isArray}} {{#isObject}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isObject}} {{#isFreeFormObject}} {{#isAnyType}} { {{#value}}{{#entrySet}}"{{{key}}}":"{{{value}}}"{{^-last}},{{/-last}}{{/entrySet}}{{/value}} } {{/isAnyType}} {{^isAnyType}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isAnyType}} {{/isFreeFormObject}}
1+
{{#isNull}} None {{/isNull}}{{#isVerbatim}}{{{value}}}{{/isVerbatim}}{{#isString}} "{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}" {{/isString}} {{#isInteger}} {{{value}}} {{/isInteger}} {{#isLong}} {{{value}}} {{/isLong}} {{#isDouble}} {{{value}}} {{/isDouble}} {{#isBoolean}} {{#lambda.titlecase}}{{{value}}}{{/lambda.titlecase}} {{/isBoolean}} {{#isEnum}} "{{{value}}}" {{/isEnum}} {{#isArray}} [ {{#value}}{{> tests/generateParams}}{{/value}} ] {{/isArray}} {{#isObject}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isObject}} {{#isFreeFormObject}} {{#isAnyType}} { {{#value}}{{#entrySet}}"{{{key}}}":"{{{value}}}"{{^-last}},{{/-last}}{{/entrySet}}{{/value}} } {{/isAnyType}} {{^isAnyType}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isAnyType}} {{/isFreeFormObject}}

‎templates/python/tests/method.mustache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{^isSyncClient}}await {{/isSyncClient}}_client.{{#lambda.snakecase}}{{{method}}}{{/lambda.snakecase}}{{#useEchoRequester}}_with_http_info{{/useEchoRequester}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}} request_options={ {{#requestOptions.headers.parameters}}"headers":loads("""{{{.}}}"""),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}"query_parameters":loads("""{{{.}}}"""),{{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})

‎templates/ruby/snippets/method.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ def snippet_for_{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}{{testIndex}
1414
{{> snippets/init}}
1515

1616
# Call the API
17-
{{#hasResponse}}response = {{/hasResponse}}client.{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}{ {{#requestOptions.headers.parameters}}:header_params => JSON.parse('{{{.}}}', :symbolize_names => true),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}:query_params => JSON.parse('{{{.}}}', :symbolize_names => true){{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
18-
17+
{{#hasResponse}}response = {{/hasResponse}}{{> tests/method}}
18+
1919
# >LOG
2020
{{#hasResponse}}
2121
# use the class directly

‎templates/ruby/tests/client/method.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{^isError}}{{#hasResponse}}req = {{/hasResponse}}{{/isError}}client.{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}{{#useEchoRequester}}_with_http_info{{/useEchoRequester}}{{#returnsBoolean}}?{{/returnsBoolean}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}{ {{#requestOptions.headers.parameters}}:header_params => JSON.parse('{{{.}}}', :symbolize_names => true),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}:query_params => JSON.parse('{{{.}}}', :symbolize_names => true){{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
1+
{{^isError}}{{#hasResponse}}req = {{/hasResponse}}{{/isError}}{{> tests/method}}

‎templates/ruby/tests/e2e/e2e.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Test{{#lambda.pascalcase}}{{{client}}}{{/lambda.pascalcase}}E2E < Test::Un
2020
{{#tests}}
2121
# {{{testName}}}
2222
def test_{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}{{testIndex}}
23-
res = @client.{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}_with_http_info({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}{ {{#requestOptions.headers.parameters}}:header_params => JSON.parse('{{{.}}}', :symbolize_names => true),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}:query_params => JSON.parse('{{{.}}}', :symbolize_names => true){{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
23+
res = @{{> tests/method}}
2424

2525
{{#response}}
2626
{{#statusCode}}

‎templates/ruby/tests/generateInnerParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isNull}}nil {{/isNull}}{{#isString}}"{{{value}}}" {{/isString}}{{#isInteger}}{{{value}}} {{/isInteger}}{{#isLong}}{{{value}}} {{/isLong}}{{#isDouble}}{{{value}}} {{/isDouble}}{{#isBoolean}}{{{value}}} {{/isBoolean}} {{#isEnum}}'{{{value}}}' {{/isEnum}}{{#isArray}} [ {{#value}}{{> tests/generateParams}}{{/value}} ] {{/isArray}}{{#isObject}} {{{objectName}}}.new({{#value}}{{> tests/generateParams}}{{/value}}) {{/isObject}}{{#isFreeFormObject}} {{#isAnyType}} { {{#value}}{{#entrySet}}'{{{key}}}':"{{{value}}}"{{^-last}},{{/-last}}{{/entrySet}}{{/value}} } {{/isAnyType}} {{^isAnyType}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isAnyType}} {{/isFreeFormObject}}
1+
{{#isNull}}nil {{/isNull}}{{#isVerbatim}}{{{value}}}{{/isVerbatim}}{{#isString}}"{{{value}}}" {{/isString}}{{#isInteger}}{{{value}}} {{/isInteger}}{{#isLong}}{{{value}}} {{/isLong}}{{#isDouble}}{{{value}}} {{/isDouble}}{{#isBoolean}}{{{value}}} {{/isBoolean}} {{#isEnum}}'{{{value}}}' {{/isEnum}}{{#isArray}} [ {{#value}}{{> tests/generateParams}}{{/value}} ] {{/isArray}}{{#isObject}} {{{objectName}}}.new({{#value}}{{> tests/generateParams}}{{/value}}) {{/isObject}}{{#isFreeFormObject}} {{#isAnyType}} { {{#value}}{{#entrySet}}'{{{key}}}':"{{{value}}}"{{^-last}},{{/-last}}{{/entrySet}}{{/value}} } {{/isAnyType}} {{^isAnyType}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isAnyType}} {{/isFreeFormObject}}

0 commit comments

Comments
 (0)