Log execAsync environment

metro.config.js

@@ -9,7 +9,7 @@ const defaultConfig = getDefaultConfig(__dirname);
 const isUsingMockAPI = process.env.E2E_TESTING === 'true';
 if (isUsingMockAPI) {
     // eslint-disable-next-line no-console
-    console.warn('⚠️ Using mock API');
+    console.log('⚠️ Using mock API');
 }
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.86-1",
+  "version": "1.3.84-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -90,14 +90,15 @@
     "@types/node": "^18.14.0",
     "@ua/react-native-airship": "^15.2.6",
     "awesome-phonenumber": "^5.4.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
     "canvas-size": "^1.2.6",
     "core-js": "^3.32.0",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^2.0.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#bdbdf44825658500ba581d3e86237d7b8996cc2e",
+    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#009c2ab79bf7ddeab0eea7a3a4c0d9cc4277c34b",
     "fbjs": "^3.0.2",
     "htmlparser2": "^7.2.0",
     "idb-keyval": "^6.2.1",
@@ -184,6 +185,8 @@
     "@babel/runtime": "^7.20.0",
     "@electron/notarize": "^1.2.3",
     "@jest/globals": "^29.5.0",
+    "@kie/act-js": "^2.0.1",
+    "@kie/mock-github": "^1.0.0",
     "@octokit/core": "4.0.4",
     "@octokit/plugin-paginate-rest": "3.1.0",
     "@octokit/plugin-throttling": "4.1.0",
@@ -266,7 +269,7 @@
     "react-native-performance-flipper-reporter": "^2.0.0",
     "react-native-svg-transformer": "^1.0.0",
     "react-test-renderer": "18.2.0",
-    "reassure": "^0.10.1",
+    "reassure": "^0.9.0",
     "setimmediate": "^1.0.5",
     "shellcheck": "^1.1.0",
     "style-loader": "^2.0.0",

src/libs/E2E/API.mock.js

@@ -9,6 +9,7 @@ import mockSigninUser from './apiMocks/signinUser';
 import mockAuthenticatePusher from './apiMocks/authenticatePusher';
 import mockOpenApp from './apiMocks/openApp';
 import mockOpenReport from './apiMocks/openReport';
+import mockSignInAttemptState from './apiMocks/signInAttemptState';
 
 /**
  * A dictionary which has the name of a API command as key, and a function which
@@ -22,10 +23,15 @@ const mocks = {
     ReconnectApp: mockOpenApp,
     OpenReport: mockOpenReport,
     AuthenticatePusher: mockAuthenticatePusher,
+    SignInAttemptState: mockSignInAttemptState,
 };
 
 function mockCall(command, apiCommandParameters, tag) {
     const mockResponse = mocks[command] && mocks[command](apiCommandParameters);
+    Log.warn('🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐');
+    Log.warn('🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐');
+    Log.warn(`Mock Call to ${command}`);
+    Log.warn('🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐🫐');
     if (!mockResponse || !_.isArray(mockResponse.onyxData)) {
         Log.warn(`[${tag}] for command ${command} is not mocked yet!`);
         return;

src/libs/E2E/apiMocks/beginSignin.js

@@ -12,6 +12,7 @@ export default ({email}) => ({
             key: 'account',
             value: {
                 validated: true,
+                hasEmailDeliveryFailure: false,
             },
         },
         {

src/libs/E2E/apiMocks/signInAttemptState.js

@@ -0,0 +1,21 @@
+export default ({email}) => ({
+    onyxData: [
+        {
+            onyxMethod: 'merge',
+            key: 'account',
+            value: {
+                isLoading: false,
+                loadingForm: null,
+            },
+        },
+        {
+            onyxMethod: 'merge',
+            key: 'credenttials',
+            value: {
+                validateCode: null,
+            },
+        },
+    ],
+    jsonCode: 200,
+    requestID: '783e54ef4b38cff5-SJC',
+});

src/libs/E2E/apiMocks/signinUser.js

@@ -115,6 +115,7 @@ export default ({email}) => ({
             key: 'account',
             value: {
                 requiresTwoFactorAuth: false,
+                hasEmailDeliveryFailure: false,
             },
         },
     ],

src/pages/signin/SignInPage.js

@@ -113,7 +113,11 @@ function getRenderOptions({hasLogin, hasValidateCode, account, isPrimaryLogin, i
     }
 
     const shouldShowLoginForm = isClientTheLeader && !hasLogin && !hasValidateCode;
+    console.warn('🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏');
+    console.warn('🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏');
+    console.warn('🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏🍏');
     const shouldShowEmailDeliveryFailurePage = hasLogin && hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !shouldInitiateSAMLLogin;
+    console.warn({shouldShowEmailDeliveryFailurePage, hasLogin, hasEmailDeliveryFailure});
     const isUnvalidatedSecondaryLogin = hasLogin && !isPrimaryLogin && !account.validated && !hasEmailDeliveryFailure;
     const shouldShowValidateCodeForm =
         hasAccount && (hasLogin || hasValidateCode) && !isUnvalidatedSecondaryLogin && !hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !isSAMLRequired;

tests/e2e/testRunner.js

@@ -153,7 +153,7 @@ const runTests = async () => {
         const tempDir = `${config.OUTPUT_DIR}/temp`;
         const tempBundlePath = `${tempDir}/index.android.bundle`;
         await execAsync(`rm -rf ${tempDir} && mkdir ${tempDir}`);
-        await execAsync(`npx react-native bundle --platform android --dev false --entry-file ${config.ENTRY_FILE} --bundle-output ${tempBundlePath}`, {E2E_TESTING: true});
+        await execAsync(`npx react-native bundle --platform android --dev false --entry-file ${config.ENTRY_FILE} --bundle-output ${tempBundlePath}`, {E2E_TESTING: 'true'});
         // Repackage the existing native app with the new bundle
         const tempApkPath = `${tempDir}/app-release.apk`;
         await execAsync(`./scripts/android-repackage-app-bundle-and-sign.sh ${appPath} ${tempBundlePath} ${tempApkPath}`);

tests/e2e/utils/execAsync.js

@@ -1,4 +1,5 @@
 const {exec} = require('child_process');
+const _ = require('underscore');
 const Logger = require('./logger');
 
 /**
@@ -11,18 +12,22 @@ const Logger = require('./logger');
 module.exports = (command, env = {}) => {
     let childProcess;
     const promise = new Promise((resolve, reject) => {
-        Logger.log(`\nRunning command:`);
+        const finalEnv = {
+            ...process.env,
+            ...env,
+        };
+
+        if (_.keys(env).length !== 0) {
+            Logger.log(`environment variables:`, JSON.stringify(finalEnv, null, 2));
+        }
+
         Logger.important(command);
 
         childProcess = exec(
             command,
             {
-                encoding: 'utf8',
                 maxBuffer: 1024 * 1024 * 10, // Increase max buffer to 10MB, to avoid errors
-                env: {
-                    ...process.env,
-                    ...env,
-                },
+                env: finalEnv,
             },
             (error, stdout) => {
                 if (error) {