fix: import/require in system test for multiple services (#146)

googleapis · Nov 19, 2019 · 5648cda · 5648cda
1 parent 973af3e
commit 5648cda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/templates/typescript_gapic/system-test/fixtures/sample/src/index.js.njk b/templates/typescript_gapic/system-test/fixtures/sample/src/index.js.njk
@@ -17,9 +17,7 @@ limitations under the License.
 -#}
 {% import "../../../../_license.njk" as license -%}
 {{license.license()}}
-{%- for service in api.services %}
 const {{ api.naming.productName.toKebabCase()}} = require('{{ api.naming.productName.toKebabCase() }}');
-{%- endfor %}
 
 function main() {
 {%- for service in api.services %}

diff --git a/templates/typescript_gapic/system-test/fixtures/sample/src/index.ts.njk b/templates/typescript_gapic/system-test/fixtures/sample/src/index.ts.njk
@@ -17,9 +17,13 @@ limitations under the License.
 -#}
 {% import "../../../../_license.njk" as license -%}
 {{license.license()}}
-{%- for service in api.services %}
-import { {{- service.name.toPascalCase() + 'Client' -}} } from '{{ api.naming.productName.toKebabCase() }}';
-{%- endfor %}
+import {
+  {%- set serviceJoiner = joiner(", ") -%}
+  {%- for service in api.services %}
+    {{- serviceJoiner() -}}
+    {{- service.name.toPascalCase() + 'Client' -}}
+  {%- endfor -%}
+} from '{{ api.naming.productName.toKebabCase() }}';
 
 function main() {
 {%- for service in api.services %}