test: cover maestro provider input coalescing

Author: thymikee

src/compat/maestro/__tests__/replay-flow.test.ts

@@ -223,7 +223,7 @@ test('parseMaestroReplayFlow keeps focused inputText and pressKey Enter as separ
   assert.deepEqual(parsed.actionLines, [3, 4, 5]);
 });
 
-test('parseMaestroReplayFlow marks tapOn before inputText for snapshot tap focus', () => {
+test('parseMaestroReplayFlow coalesces tapOn inputText without requiring Enter', () => {
   const parsed = parseMaestroReplayFlow(`appId: com.callstack.agentdevicelab
 ---
 - tapOn:
@@ -234,11 +234,12 @@ test('parseMaestroReplayFlow marks tapOn before inputText for snapshot tap focus
   assert.deepEqual(
     parsed.actions.map((entry) => [entry.command, entry.positionals]),
     [
-      ['__maestroTapOn', ['id="editableNameInput"']],
-      ['type', ['Saved list']],
+      ['wait', ['id="editableNameInput"', '30000']],
+      ['fill', ['id="editableNameInput"', 'Saved list']],
     ],
   );
-  assert.equal(parsed.actions[0]?.flags?.maestro?.allowNonHittableCoordinateFallback, undefined);
+  assert.deepEqual(parsed.actionLines, [3, 3]);
+  assert.equal(parsed.actions[1]?.flags?.maestro?.allowNonHittableCoordinateFallback, true);
 });
 
 test('parseMaestroReplayFlow coalesces tapOn inputText while preserving pressKey Enter submit', () => {
@@ -658,10 +659,10 @@ test('parseMaestroReplayFlow parses the test-app Maestro suite fixture', () => {
       '__maestroAssertVisible',
       '__maestroTapOn',
       '__maestroAssertVisible',
-      '__maestroTapOn',
-      'type',
-      '__maestroTapOn',
-      'type',
+      'wait',
+      'fill',
+      'wait',
+      'fill',
       '__maestroTapOn',
       '__maestroAssertVisible',
       '__maestroAssertVisible',

src/compat/maestro/replay-flow.ts

@@ -113,27 +113,32 @@ function optimizeTypedAfterTap(
   if (!isLikelyTextEntrySelector(tapSelector)) {
     return { actions: [clearMaestroNonHittableTap(action)], actionLines: [line], consumed: 1 };
   }
+  const fillActions: SessionAction[] = [
+    {
+      ...action,
+      command: 'wait',
+      positionals: [tapSelector, '30000'],
+    },
+    {
+      ...nextAction,
+      command: 'fill',
+      positionals: [tapSelector, typedAfterTap],
+      flags: action.flags,
+    },
+  ];
+  const fillActionLines = [line, line];
   const pressEnterAction = actions[index + 2];
-  if (pressEnterAction?.command !== MAESTRO_RUNTIME_COMMAND.pressEnter) {
-    return { actions: [clearMaestroNonHittableTap(action)], actionLines: [line], consumed: 1 };
+  if (pressEnterAction?.command === MAESTRO_RUNTIME_COMMAND.pressEnter) {
+    return {
+      actions: [...fillActions, pressEnterAction],
+      actionLines: [...fillActionLines, actionLines[index + 2] ?? line],
+      consumed: 3,
+    };
   }
   return {
-    actions: [
-      {
-        ...action,
-        command: 'wait',
-        positionals: [tapSelector, '30000'],
-      },
-      {
-        ...nextAction,
-        command: 'fill',
-        positionals: [tapSelector, typedAfterTap],
-        flags: action.flags,
-      },
-      pressEnterAction,
-    ],
-    actionLines: [line, line, actionLines[index + 2] ?? line],
-    consumed: 3,
+    actions: fillActions,
+    actionLines: fillActionLines,
+    consumed: 2,
   };
 }
 

test/integration/provider-scenarios/android-test-suite.test.ts

@@ -121,7 +121,7 @@ test('Provider-backed integration Android Maestro replay uses fresh selector sna
         world.adbCalls.find((call) => call.slice(0, 3).join(' ') === 'shell input swipe'),
         ['shell', 'input', 'swipe', '351', '390', '39', '390', '300'],
       );
-      assert.equal(snapshots >= 2, true);
+      assert.equal(snapshots, 2);
     },
   );
 });
@@ -167,18 +167,74 @@ test('Provider-backed integration Android Maestro replay test suite discovers YA
         world.adbCalls.find((call) => call.slice(0, 3).join(' ') === 'shell input tap'),
         ['shell', 'input', 'tap', '180', '330'],
       );
-      assert.equal(snapshots >= 2, true);
+      assert.equal(snapshots, 2);
     },
   );
 });
 
-test('Provider-backed integration Android Maestro coalesces tapOn inputText and pressKey Enter through native paths', async () => {
+test('Provider-backed integration Android Maestro fills tapOn inputText without trailing Enter', async () => {
   await withProviderScenarioResource(
     async () => await createAndroidSettingsWorld({ nativeTextInjection: true }),
     async (world) => {
       const client = world.daemon.client();
       const suiteRoot = path.join(world.tempRoot, 'suite-maestro-input');
       fs.mkdirSync(suiteRoot, { recursive: true });
+      const flowPath = path.join(suiteRoot, 'input-only.yaml');
+      fs.writeFileSync(
+        flowPath,
+        [
+          'appId: com.android.settings',
+          '---',
+          '- launchApp',
+          '- tapOn: Search',
+          '- inputText: "Łódź café"',
+          '',
+        ].join('\n'),
+      );
+
+      const suite = await client.replay.test({
+        paths: [flowPath],
+        backend: 'maestro',
+        artifactsDir: path.join(suiteRoot, 'artifacts'),
+        timeoutMs: 30000,
+        ...world.selection,
+      });
+
+      assert.equal(suite.total, 1, JSON.stringify(suite));
+      assert.equal(suite.passed, 1, JSON.stringify(suite));
+      assert.equal(suite.failed, 0, JSON.stringify(suite));
+      assert.deepEqual(world.textInjectionCalls, [
+        {
+          action: 'fill',
+          target: { x: 195, y: 52 },
+          text: 'Łódź café',
+          delayMs: 0,
+        },
+      ]);
+      assert.equal(
+        world.adbCalls.some(
+          (call) => call[0] === 'shell' && call[1] === 'input' && call[2] === 'text',
+        ),
+        false,
+        JSON.stringify(world.adbCalls),
+      );
+      assert.equal(
+        world.adbCalls.some((call) => call.slice(0, 4).join(' ') === 'shell input keyevent ENTER'),
+        false,
+        JSON.stringify(world.adbCalls),
+      );
+      world.assertNoHostAdbCalls();
+    },
+  );
+});
+
+test('Provider-backed integration Android Maestro preserves pressKey Enter after native fill', async () => {
+  await withProviderScenarioResource(
+    async () => await createAndroidSettingsWorld({ nativeTextInjection: true }),
+    async (world) => {
+      const client = world.daemon.client();
+      const suiteRoot = path.join(world.tempRoot, 'suite-maestro-input-submit');
+      fs.mkdirSync(suiteRoot, { recursive: true });
       const flowPath = path.join(suiteRoot, 'input-submit.yaml');
       fs.writeFileSync(
         flowPath,
@@ -277,7 +333,7 @@ test('Provider-backed integration Android Maestro executes runFlow conditions an
         world.adbCalls.find((call) => call.slice(0, 3).join(' ') === 'shell input tap'),
         ['shell', 'input', 'tap', '180', '330'],
       );
-      assert.equal(snapshots >= 3, true);
+      assert.equal(snapshots, 3);
     },
   );
 });