Added support for an alternative terminatingKeyword when emitting methods/functions

Author: David Haeffner

packages/code-export-javascript-mocha/src/command.js

@@ -146,10 +146,13 @@ function variableSetter(varName, value) {
 
 function emitWaitForWindow() {
   const generateMethodDeclaration = name => {
-    return `async function ${name}(timeout = 2) {`
+    return {
+      body: `async function ${name}(timeout = 2) {`,
+      terminatingKeyword: '}',
+    }
   }
   const commands = [
-    { level: 0, statement: 'await driver.sleep(timeout / 1000)' },
+    { level: 0, statement: 'await driver.sleep(timeout)' },
     { level: 0, statement: 'const handlesThen = vars["windowHandles"]' },
     {
       level: 0,

packages/code-export-javascript-mocha/src/index.js

@@ -34,19 +34,18 @@ opts.generateMethodDeclaration = generateMethodDeclaration
 
 // Create generators for dynamic string creation of primary entities (e.g., filename, methods, test, and suite)
 function generateTestDeclaration(name) {
-  return `it('${exporter.parsers.uncapitalize(
-    exporter.parsers.sanitizeName(name)
-  )}', async function() {`
+  return `it('${name}', async function() {`
 }
 function generateMethodDeclaration(name) {
-  return `async function ${exporter.parsers.uncapitalize(
-    exporter.parsers.sanitizeName(name)
-  )}() {`
+  return {
+    body: `async function ${exporter.parsers.uncapitalize(
+      exporter.parsers.sanitizeName(name)
+    )}() {`,
+    terminatingKeyword: '}',
+  }
 }
 function generateSuiteDeclaration(name) {
-  return `describe('${exporter.parsers.uncapitalize(
-    exporter.parsers.sanitizeName(name)
-  )}', function() {`
+  return `describe('${name}', function() {`
 }
 function generateFilename(name) {
   return `${exporter.parsers.uncapitalize(

packages/code-export-utils/src/emit.js

@@ -105,6 +105,12 @@ async function emitMethod(
   } = {}
 ) {
   const methodDeclaration = generateMethodDeclaration(method.name)
+  let _methodDeclaration = methodDeclaration
+  let _terminatingKeyword = terminatingKeyword
+  if (typeof methodDeclaration === 'object') {
+    _methodDeclaration = methodDeclaration.body
+    _terminatingKeyword = methodDeclaration.terminatingKeyword
+  }
   let result
   if (overrideCommandEmitting) {
     result = method.commands.map(
@@ -114,9 +120,9 @@ async function emitMethod(
     result = await emitCommands(method.commands, emitter)
   }
   return [
-    methodDeclaration,
+    _methodDeclaration,
     result.join(`\n${commandPrefixPadding}`).replace(/^/, commandPrefixPadding),
-    terminatingKeyword,
+    _terminatingKeyword,
   ]
 }
 

packages/code-export-utils/src/register.js

@@ -49,7 +49,11 @@ export async function registerMethod(
   result,
   { generateMethodDeclaration, hooks }
 ) {
-  const methodDeclaration = generateMethodDeclaration(name)
+  let methodDeclaration = generateMethodDeclaration(name)
+  methodDeclaration =
+    typeof methodDeclaration === 'object'
+      ? methodDeclaration.body
+      : methodDeclaration
   if (!(await hooks.declareMethods.isRegistered(methodDeclaration))) {
     result.forEach(statement => {
       hooks.declareMethods.register(() => {