Fixed a bug in control flow that prevented commands at the end of a loop from linking back to the start of the loop. Fixes #559.

Author: David Haeffner

packages/selenium-ide/src/neo/__test__/playback/playback-tree/playback-tree.spec.js

@@ -116,6 +116,27 @@ describe('Control Flow', () => {
         expect(stack[2].right).toBeUndefined()
         expect(stack[2].left).toBeUndefined()
       })
+      test('while-command-command-end', () => {
+        let input = [
+          createCommand(ControlFlowCommandNames.while),
+          createCommand('command'),
+          createCommand('command'),
+          createCommand(ControlFlowCommandNames.end),
+        ]
+        let stack = createCommandNodesFromCommandStack(input)
+        expect(stack[0].next).toBeUndefined()
+        expect(stack[0].right).toEqual(stack[1])
+        expect(stack[0].left).toEqual(stack[3])
+        expect(stack[1].next).toEqual(stack[2])
+        expect(stack[1].right).toBeUndefined()
+        expect(stack[1].left).toBeUndefined()
+        expect(stack[2].next).toEqual(stack[0])
+        expect(stack[2].right).toBeUndefined()
+        expect(stack[2].left).toBeUndefined()
+        expect(stack[3].next).toBeUndefined()
+        expect(stack[3].right).toBeUndefined()
+        expect(stack[3].left).toBeUndefined()
+      })
       test('while-if-end-end', () => {
         let input = [
           createCommand(ControlFlowCommandNames.while), // 0
@@ -141,26 +162,34 @@ describe('Control Flow', () => {
         expect(stack[4].right).toBeUndefined()
         expect(stack[4].left).toBeUndefined()
       })
-      test('while-command-command-end', () => {
+      test('while-if-end-command-end', () => {
         let input = [
-          createCommand(ControlFlowCommandNames.while),
-          createCommand('command'),
-          createCommand('command'),
-          createCommand(ControlFlowCommandNames.end),
+          createCommand(ControlFlowCommandNames.while), // 0
+          createCommand(ControlFlowCommandNames.if), // 1
+          createCommand('command'), // 2
+          createCommand(ControlFlowCommandNames.end), // 3
+          createCommand('command'), // 4
+          createCommand(ControlFlowCommandNames.end), // 5
         ]
         let stack = createCommandNodesFromCommandStack(input)
         expect(stack[0].next).toBeUndefined()
         expect(stack[0].right).toEqual(stack[1])
-        expect(stack[0].left).toEqual(stack[3])
-        expect(stack[1].next).toEqual(stack[2])
-        expect(stack[1].right).toBeUndefined()
-        expect(stack[1].left).toBeUndefined()
-        expect(stack[2].next).toEqual(stack[0])
+        expect(stack[0].left).toEqual(stack[5])
+        expect(stack[1].next).toBeUndefined()
+        expect(stack[1].right).toEqual(stack[2])
+        expect(stack[1].left).toEqual(stack[3])
+        expect(stack[2].next).toEqual(stack[3])
         expect(stack[2].right).toBeUndefined()
         expect(stack[2].left).toBeUndefined()
-        expect(stack[3].next).toBeUndefined()
+        expect(stack[3].next).toEqual(stack[4])
         expect(stack[3].right).toBeUndefined()
         expect(stack[3].left).toBeUndefined()
+        expect(stack[4].next).toEqual(stack[0])
+        expect(stack[4].right).toBeUndefined()
+        expect(stack[4].left).toBeUndefined()
+        expect(stack[5].next).toBeUndefined()
+        expect(stack[5].right).toBeUndefined()
+        expect(stack[5].left).toBeUndefined()
       })
       test('if-command-while-command-end-end', () => {
         let input = [

packages/selenium-ide/src/neo/playback/playback-tree/index.js

@@ -126,11 +126,22 @@ function trackBranchOpen(commandNode, nextCommandNode, stack, state) {
 }
 
 function trackBranchClose(commandNode, nextCommandNode, stack, state) {
-  let _nextNode = nextCommandNode
   state.pop()
   const top = state.top()
-  if (top && ControlFlowCommandChecks.isLoop(top)) _nextNode = stack[top.index]
-  connectNext(commandNode, _nextNode, stack, state)
+  let nextCommandNodeOverride
+  if (
+    top &&
+    ControlFlowCommandChecks.isLoop(top) &&
+    nextCommandNode &&
+    ControlFlowCommandChecks.isEnd(nextCommandNode.command)
+  )
+    nextCommandNodeOverride = stack[top.index]
+  connectNext(
+    commandNode,
+    nextCommandNodeOverride ? nextCommandNodeOverride : nextCommandNode,
+    stack,
+    state
+  )
 }
 
 function connectConditionalForBranchOpen(