add clearing of input

nagacoder · Oct 27, 2023 · 8152008 · 8152008
1 parent 602bdbd
commit 8152008
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 11 deletions.
diff --git a/src/libs/E2E/tests/reportTypingTest.e2e.js b/src/libs/E2E/tests/reportTypingTest.e2e.js
@@ -30,9 +30,13 @@ const test = () => {
 
             // Wait until keyboard is visible (so we are focused on the input):
             waitForKeyboard().then(() => {
-                resetRerenderCount();
                 console.debug(`[E2E] Keyboard visible, typing…`);
-                E2EClient.sendNativeCommand(NativeCommands.makeTypeTextCommand('A'))
+                E2EClient.sendNativeCommand(NativeCommands.makeBackspaceCommand())
+                    .then(() => {
+                        resetRerenderCount();
+                        return Promise.resolve();
+                    })
+                    .then(() => E2EClient.sendNativeCommand(NativeCommands.makeTypeTextCommand('A')))
                     .then(() => {
                         setTimeout(() => {
                             const rerenderCount = getRerenderCount();
@@ -43,8 +47,9 @@ const test = () => {
                             }).then(E2EClient.submitTestDone);
                         }, 3000);
                     })
-                    .catch(() => {
-                        // TODO: error handling
+                    .catch((error) => {
+                        console.error('[E2E] Error while test', error);
+                        E2EClient.submitTestDone();
                     });
             });
         });

diff --git a/tests/e2e/nativeCommands/NativeCommandsAction.js b/tests/e2e/nativeCommands/NativeCommandsAction.js
@@ -1,6 +1,7 @@
 const NativeCommandsAction = {
     scroll: 'scroll',
     type: 'type',
+    backspace: 'backspace',
 };
 
 const makeTypeTextCommand = (text) => ({
@@ -10,7 +11,12 @@ const makeTypeTextCommand = (text) => ({
     },
 });
 
+const makeBackspaceCommand = () => ({
+    actionName: NativeCommandsAction.backspace,
+});
+
 module.exports = {
     NativeCommandsAction,
     makeTypeTextCommand,
+    makeBackspaceCommand,
 };
diff --git a/tests/e2e/nativeCommands/adbBackspace.js b/tests/e2e/nativeCommands/adbBackspace.js
@@ -0,0 +1,10 @@
+const execAsync = require('../utils/execAsync');
+const Logger = require('../utils/logger');
+
+const adbBackspace = async () => {
+    Logger.log(`🔙 Pressing backspace`);
+    execAsync(`adb shell input keyevent KEYCODE_DEL`);
+    return true;
+};
+
+module.exports = adbBackspace;
diff --git a/tests/e2e/nativeCommands/index.js b/tests/e2e/nativeCommands/index.js
@@ -1,3 +1,4 @@
+const adbBackspace = require('./adbBackspace');
 const adbTypeText = require('./adbTypeText');
 const {NativeCommandsAction} = require('./NativeCommandsAction');
 
@@ -7,6 +8,8 @@ const executeFromPayload = (actionName, payload) => {
             throw new Error('Not implemented yet');
         case NativeCommandsAction.type:
             return adbTypeText(payload.text);
+        case NativeCommandsAction.backspace:
+            return adbBackspace();
         default:
             throw new Error(`Unknown action: ${actionName}`);
     }

diff --git a/tests/e2e/server/index.js b/tests/e2e/server/index.js
@@ -127,15 +127,21 @@ const createServerInstance = () => {
             }
 
             case Routes.testNativeCommand: {
-                getPostJSONRequestData(req, res).then((data) =>
-                    executeFromPayload(data.actionName, data.payload).then((status) => {
-                        if (status) {
-                            return res.end('ok');
-                        }
+                getPostJSONRequestData(req, res)
+                    .then((data) =>
+                        executeFromPayload(data.actionName, data.payload).then((status) => {
+                            if (status) {
+                                return res.end('ok');
+                            }
+                            res.statusCode = 500;
+                            res.end('Error executing command');
+                        }),
+                    )
+                    .catch((error) => {
+                        Logger.error('Error executing command', error);
                         res.statusCode = 500;
                         res.end('Error executing command');
-                    }),
-                );
+                    });
                 break;
             }