Placed the waitForWindow emitter behind an "extras" key in the Command emitter in java-junit, and updated code-export-util/emit to work with the emitter.extras keys using a whitelist

Author: David Haeffner

packages/code-export-java-junit/src/command.js

@@ -112,7 +112,6 @@ export const emitters = {
   waitForElementNotEditable: emitWaitForElementNotEditable,
   waitForElementNotPresent: emitWaitForElementNotPresent,
   waitForElementNotVisible: emitWaitForElementNotVisible,
-  waitForWindow: emitWaitForWindow,
   webdriverAnswerOnVisiblePrompt: emitAnswerOnNextPrompt,
   webdriverChooseCancelOnVisibleConfirmation: emitChooseCancelOnNextConfirmation,
   webdriverChooseCancelOnVisiblePrompt: emitChooseCancelOnNextConfirmation,
@@ -1049,5 +1048,5 @@ async function emitWaitForElementNotVisible(locator, timeout) {
 export default {
   emit,
   register,
-  emitWaitForWindow,
+  extras: { emitWaitForWindow },
 }

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

@@ -147,18 +147,28 @@ async function emitTest(
   if (!testLevel) testLevel = 1
   if (!commandLevel) commandLevel = 2
   const methods = findReusedTestMethods(test, tests)
-  if (findCommandThatOpensWindow(test.commands) && emitter.emitWaitForWindow) {
-    const method = await emitter.emitWaitForWindow()
-    const result = await emitMethod(method, {
-      emitter,
-      commandPrefixPadding,
-      generateMethodDeclaration: method.generateMethodDeclaration,
-      terminatingKeyword,
-      overrideCommandEmitting: true,
-    })
-    await registerMethod(method.name, result, {
-      generateMethodDeclaration,
-      hooks,
+  if (emitter.extras) {
+    Object.keys(emitter.extras).forEach(async emitter_name => {
+      let ignore = true
+      if (
+        emitter_name === 'emitWaitForWindow' &&
+        findCommandThatOpensWindow(test.commands)
+      )
+        ignore = false
+      if (!ignore) {
+        const method = await emitter.extras[emitter_name]()
+        const result = await emitMethod(method, {
+          emitter,
+          commandPrefixPadding,
+          generateMethodDeclaration: method.generateMethodDeclaration,
+          terminatingKeyword,
+          overrideCommandEmitting: true,
+        })
+        await registerMethod(method.name, result, {
+          generateMethodDeclaration,
+          hooks,
+        })
+      }
     })
   }
   for (const method of methods) {