In code export -- added recursive lookup of reused test cases for commands that open a new window, so the new window util method is emitted.

Author: David Haeffner

packages/code-export-utils/__test__/src/find.spec.js

@@ -30,17 +30,28 @@ describe('find', () => {
       const command = new Command(undefined, 'click', 'id=blah')
       command.opensWindow = true
       test.addCommand(command)
-      const result = findCommandThatOpensWindow(test.commands)
+      const result = findCommandThatOpensWindow(test)
       expect(result.command).toEqual('click')
     })
     it('should not find a command that opens a window if one is not present in a test', () => {
       const test = new TestCase(undefined, 'blah')
       test.createCommand(undefined, 'open', '/')
       const command = new Command(undefined, 'click', 'id=blah')
       test.addCommand(command)
-      const result = findCommandThatOpensWindow(test.commands)
+      const result = findCommandThatOpensWindow(test)
       expect(result).toBeUndefined()
     })
+    it('should find a command within a reused test method', () => {
+      const test = new TestCase()
+      test.createCommand(undefined, 'run', 'blah')
+      const anotherTest = new TestCase(undefined, 'blah')
+      const command = new Command(undefined, 'click', 'id=blah')
+      command.opensWindow = true
+      anotherTest.addCommand(command)
+      const tests = [test, anotherTest]
+      const result = findCommandThatOpensWindow(test, tests)
+      expect(result).toBeTruthy()
+    })
   })
   describe('findReusedTestMethods', () => {
     it('should find a reused test method', () => {

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

@@ -148,11 +148,11 @@ async function emitTest(
   if (!commandLevel) commandLevel = 2
   const methods = findReusedTestMethods(test, tests)
   if (emitter.extras) {
-    Object.keys(emitter.extras).forEach(async emitter_name => {
+    for (const emitter_name in emitter.extras) {
       let ignore = true
       if (
         emitter_name === 'emitWaitForWindow' &&
-        findCommandThatOpensWindow(test.commands)
+        findCommandThatOpensWindow(test, tests)
       )
         ignore = false
       if (!ignore) {
@@ -169,7 +169,7 @@ async function emitTest(
           hooks,
         })
       }
-    })
+    }
   }
   for (const method of methods) {
     const result = await emitMethod(method, {

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

@@ -27,13 +27,19 @@ export function findReusedTestMethods(test, tests, _results) {
   return results
 }
 
-export function findCommandThatOpensWindow(commands) {
+export function findCommandThatOpensWindow(test, tests) {
   let result
-  for (const command of commands) {
+  for (const command of test.commands) {
     if (command.opensWindow) {
       result = command
       break
     }
+    if (command.command === 'run') {
+      const nestedTests = findReusedTestMethods(test, tests)
+      for (const nestedTest in nestedTests) {
+        return findCommandThatOpensWindow(nestedTests[nestedTest], nestedTests)
+      }
+    }
   }
   return result
 }