chore(tests): Add block with statment inputs to statement test blocks

Add a new, E-shaped block with ID complex_mover to
moveStatementTestBlocks, and update expected test results for
statement move tests.

Author: cpcallen

test/loadTestBlocks.js

@@ -870,17 +870,17 @@ const moveStartTestBlocks = {
   },
 };
 
-// A bunch of statement blocks.  The draw_emoji block will be
-// (constrained) moved up, down, left and right to verify that it
-// visits the expected positions.
+// A bunch of statement blocks.  The blocks with IDs simple_mover and
+// complex_mover will be (constrained-)moved up, down, left and right
+// to verify that they visit all the expected candidate connections.
 const moveStatementTestBlocks = {
   'blocks': {
     'languageVersion': 0,
     'blocks': [
       {
         'type': 'p5_setup',
         'id': 'p5_setup',
-        'x': 0,
+        'x': 75,
         'y': 75,
         'deletable': false,
         'inputs': {
@@ -897,9 +897,18 @@ const moveStatementTestBlocks = {
               'next': {
                 'block': {
                   'type': 'draw_emoji',
-                  'id': 'draw_emoji',
+                  'id': 'simple_mover',
                   'fields': {
-                    'emoji': '✨',
+                    'emoji': '✨'
+                  },
+                  'next': {
+                    'block': {
+                      'type': 'controls_if',
+                      'id': 'complex_mover',
+                      'extraState': {
+                        'hasElse': true,
+                      },
+                    },
                   },
                 },
               },
@@ -910,8 +919,11 @@ const moveStatementTestBlocks = {
       {
         'type': 'text_print',
         'id': 'text_print',
-        'x': 0,
-        'y': 300,
+        "disabledReasons": [
+          "MANUALLY_DISABLED"
+        ],
+        'x': 75,
+        'y': 400,
         'inputs': {
           'TEXT': {
             'shadow': {
@@ -956,8 +968,8 @@ const moveStatementTestBlocks = {
       {
         'type': 'p5_draw',
         'id': 'p5_draw',
-        'x': 0,
-        'y': 753,
+        'x': 75,
+        'y': 950,
         'deletable': false,
       },
     ],

test/webdriverio/test/move_test.ts

@@ -174,14 +174,17 @@ suite('Statement move tests', function () {
   });
 
   /** ID of a statement block with no inputs. */
-  const BLOCK_SIMPLE = 'draw_emoji';
+  const BLOCK_SIMPLE = 'simple_mover';
 
   /**
    * Expected connection candidates when moving BLOCK_SIMPLE, after
    * pressing right or down arrow n times.
    */
   const EXPECTED_SIMPLE = [
     {id: 'p5_canvas', index: 1, ownIndex: 0}, // Next; starting location.
+    {id: 'complex_mover', index: 3, ownIndex: 0}, // "If" statement input.
+    {id: 'complex_mover', index: 4, ownIndex: 0}, // "Else" statement input.
+    {id: 'complex_mover', index: 1, ownIndex: 0}, // Next.
     {id: 'text_print', index: 0, ownIndex: 1}, // Previous.
     {id: 'text_print', index: 1, ownIndex: 0}, // Next.
     {id: 'controls_if', index: 3, ownIndex: 0}, // "If" statement input.
@@ -198,9 +201,9 @@ suite('Statement move tests', function () {
   test(
     'Constrained move of simple stack block right',
     moveTest(BLOCK_SIMPLE, Key.ArrowRight, EXPECTED_SIMPLE, {
-      parentId: null,
-      parentIndex: null,
-      nextId: 'text_print',
+      parentId: 'complex_mover',
+      parentIndex: 3,
+      nextId: null,
       valueId: null,
     }),
   );
@@ -216,9 +219,9 @@ suite('Statement move tests', function () {
   test(
     'Constrained move of simple stack block down',
     moveTest(BLOCK_SIMPLE, Key.ArrowDown, EXPECTED_SIMPLE, {
-      parentId: null,
-      parentIndex: null,
-      nextId: 'text_print',
+      parentId: 'complex_mover',
+      parentIndex: 3,
+      nextId: null,
       valueId: null,
     }),
   );