Merge pull request #37676 from kubabutkiewicz/ts-migration/G9

[No QA] [TS migration] Migrate 'GooglePlacesUtils.perf-test.js' , 'merge.js' , 'adbTypeText.js' , adbBackspace.js' , 'removeInvisibleCharacters.js' test to TypeScript
Expensify · Mar 13, 2024 · 62035d0 · 62035d0
2 parents fa6bcc0 + d3ddd48
commit 62035d0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 19 deletions.
diff --git a/tests/e2e/merge.js → tests/e2e/merge.ts b/tests/e2e/merge.js → tests/e2e/merge.ts
diff --git a/tests/e2e/nativeCommands/adbBackspace.js → tests/e2e/nativeCommands/adbBackspace.ts b/tests/e2e/nativeCommands/adbBackspace.js → tests/e2e/nativeCommands/adbBackspace.ts
@@ -1,7 +1,7 @@
 import execAsync from '../utils/execAsync';
 import * as Logger from '../utils/logger';
 
-const adbBackspace = async () => {
+const adbBackspace = () => {
     Logger.log(`🔙 Pressing backspace`);
     execAsync(`adb shell input keyevent KEYCODE_DEL`);
     return true;

diff --git a/tests/e2e/nativeCommands/adbTypeText.js → tests/e2e/nativeCommands/adbTypeText.ts b/tests/e2e/nativeCommands/adbTypeText.js → tests/e2e/nativeCommands/adbTypeText.ts
@@ -1,7 +1,7 @@
 import execAsync from '../utils/execAsync';
 import * as Logger from '../utils/logger';
 
-const adbTypeText = async (text) => {
+const adbTypeText = (text: string) => {
     Logger.log(`📝 Typing text: ${text}`);
     execAsync(`adb shell input text "${text}"`);
     return true;

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

diff --git a/.../perf-test/GooglePlacesUtils.perf-test.js → .../perf-test/GooglePlacesUtils.perf-test.ts b/.../perf-test/GooglePlacesUtils.perf-test.js → .../perf-test/GooglePlacesUtils.perf-test.ts
@@ -1,7 +1,8 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import {measureFunction} from 'reassure';
-import * as GooglePlacesUtils from '../../src/libs/GooglePlacesUtils';
+import * as GooglePlacesUtils from '@src/libs/GooglePlacesUtils';
 
-const addressComponents = [
+const addressComponents: GooglePlacesUtils.AddressComponent[] = [
     {
         long_name: 'Bushwick',
         short_name: 'Bushwick',
@@ -34,7 +35,7 @@ const addressComponents = [
     },
 ];
 
-const bigObjectToFind = {
+const bigObjectToFind: GooglePlacesUtils.FieldsToExtract = {
     sublocality: 'long_name',
     administrative_area_level_1: 'short_name',
     postal_code: 'long_name',

diff --git a/tests/unit/removeInvisibleCharacters.js → tests/unit/removeInvisibleCharacters.ts b/tests/unit/removeInvisibleCharacters.js → tests/unit/removeInvisibleCharacters.ts
@@ -1,6 +1,5 @@
-import _ from 'underscore';
-import enEmojis from '../../assets/emojis/en';
-import StringUtils from '../../src/libs/StringUtils';
+import enEmojis from '@assets/emojis/en';
+import StringUtils from '@src/libs/StringUtils';
 
 describe('libs/StringUtils.removeInvisibleCharacters', () => {
     it('basic tests', () => {
@@ -80,7 +79,7 @@ describe('libs/StringUtils.removeInvisibleCharacters', () => {
         expect(StringUtils.removeInvisibleCharacters('test😀😀😀')).toBe('test😀😀😀');
     });
     it('all emojis not removed', () => {
-        _.keys(enEmojis).forEach((key) => {
+        Object.keys(enEmojis).forEach((key) => {
             expect(StringUtils.removeInvisibleCharacters(key)).toBe(key);
         });
     });