Merged new emulator configurations

Author: gosha212

package.json

@@ -75,10 +75,10 @@
     }
   },
   "dependencies": {
+    "hoist-non-react-statics": "3.x.x",
     "lodash": "4.17.x",
     "prop-types": "15.x.x",
     "react-lifecycles-compat": "^3.0.4",
-    "hoist-non-react-statics": "3.x.x",
     "tslib": "1.9.3"
   },
   "devDependencies": {
@@ -108,7 +108,7 @@
     "@typescript-eslint/eslint-plugin": "8.21.0",
     "@typescript-eslint/parser": "8.21.0",
     "clang-format": "^1.4.0",
-    "detox": "20.34.4",
+    "detox": "20.46.0",
     "detox-testing-library-rnn-adapter": "^2.0.3",
     "eslint": "^8.19.0",
     "eslint-config-prettier": "6.11.0",

playground/android/app/src/main/res/values/styles.xml

@@ -2,5 +2,6 @@
 <resources>
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowBackground">@color/backgroundColor</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 </resources>

playground/e2e/AndroidUtils.js

@@ -16,28 +16,6 @@ const utils = {
     // TODO Change to use Detox's ADB (see keyboard driver)
     exec.execSync(`adb -s ${device.id} shell ${command}`);
   },
-  setDemoMode: () => {
-    // enter demo mode
-    utils.executeShellCommand('settings put global sysui_demo_allowed 1');
-    // display time 12:00
-    utils.executeShellCommand(
-      'am broadcast -a com.android.systemui.demo -e command clock -e hhmm 1200'
-    );
-    // Display full mobile data with 4g type and no wifi
-    utils.executeShellCommand(
-      'am broadcast -a com.android.systemui.demo -e command network -e mobile show -e level 4 -e datatype 4g -e wifi false'
-    );
-    // Hide notifications
-    utils.executeShellCommand(
-      'am broadcast -a com.android.systemui.demo -e command notifications -e visible false'
-    );
-    // Disable pointer location
-    utils.executeShellCommand('settings put system pointer_location 0');
-    // Show full battery but not in charging state
-    utils.executeShellCommand(
-      'am broadcast -a com.android.systemui.demo -e command battery -e plugged false -e level 100'
-    );
-  },
 };
 
 export default utils;

playground/e2e/Overlay.test.js

@@ -58,12 +58,13 @@ describe('Overlay', () => {
 
   it.e2e(':android: should show banner overlay and not block the screen', async () => {
     const snapshottedImagePath = './e2e/assets/overlay_banner_padding.png';
-    Android.setDemoMode();
+
     let expected = await device.takeScreenshot('without_banner');
     await elementById(TestIDs.SHOW_BANNER_OVERLAY).tap();
     await expect(elementById(TestIDs.BANNER_OVERLAY)).toBeVisible();
     const actual = await device.takeScreenshot('with_banner');
     expectImagesToBeNotEqual(expected, actual)
+
     await elementById(TestIDs.SET_LAYOUT_BOTTOM_INSETS).tap();
     expected = await device.takeScreenshot('with_banner');
     expectImagesToBeEqual(expected, snapshottedImagePath)

playground/e2e/assets/overlay_banner_padding.png

@@ -25,54 +25,56 @@ const config = {
         os: '15.5',
       },
     },
-    'genymotion.emulator.name': {
-      type: 'android.genycloud',
-      device: {
-        recipeUUID: '9baf12f9-a645-4ffa-a688-0e92584d6194',
-      },
-    },
     emulator: {
       type: 'android.emulator',
       device: {
         avdName: 'Pixel_3a_API_35',
       },
+      systemUI: {
+        pointerLocationBar: 'hide',
+        touches: 'show',
+        navigationMode: '3-button',
+        statusBar: {
+          notifications: 'hide',
+          clock: '1200',
+          wifiSignal: 'none',
+          mobileSignal: 'none',
+          battery: 'full',
+          charging: false,
+        },
+      },
     },
   },
   apps: {
     'ios.debug': {
       type: 'ios.app',
-      binaryPath:
-        'ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app',
-      start: 'react-native start',
-      build:
-        'RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground -workspace ios/playground.xcworkspace -sdk iphonesimulator -configuration Debug -derivedDataPath ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet -UseModernBuildSystem=YES',
+      binaryPath: 'ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app',
+      start: 'npm start -- --e2e',
+      build: 'RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground -workspace ios/playground.xcworkspace -sdk iphonesimulator -configuration Debug -derivedDataPath ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet -UseModernBuildSystem=YES',
     },
     'ios.release': {
       type: 'ios.app',
-      binaryPath:
-        'ios/DerivedData/playground/Build/Products/Release-iphonesimulator/playground.app',
-      build:
-        'RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground_release -workspace ios/playground.xcworkspace -sdk iphonesimulator -configuration Release -derivedDataPath ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet -UseModernBuildSystem=YES',
+      binaryPath: 'ios/DerivedData/playground/Build/Products/Release-iphonesimulator/playground.app',
+      build: 'RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground_release -workspace ios/playground.xcworkspace -sdk iphonesimulator -configuration Release -derivedDataPath ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet -UseModernBuildSystem=YES',
     },
     'android.debug': {
       type: 'android.apk',
       binaryPath: 'android/app/build/outputs/apk/debug/app-debug.apk',
-      start: 'react-native start',
-      build:
-        'cd android && ./gradlew app:assembleDebug app:assembleAndroidTest -DtestBuildType=debug',
-      reversePorts: [8081],
+      start: 'npm start -- --e2e',
+      build: 'cd playground/android && ./gradlew app:assembleDebug app:assembleAndroidTest -DtestBuildType=debug',
+      reversePorts: [
+        8081,
+      ],
     },
     'android.release': {
       type: 'android.apk',
       binaryPath: 'android/app/build/outputs/apk/release/app-release.apk',
-      build:
-        'cd android && ./gradlew app:assembleRelease app:assembleAndroidTest -DtestBuildType=release',
+      build: 'cd android && ./gradlew app:assembleRelease app:assembleAndroidTest -DtestBuildType=release',
     },
   },
   configurations: {
     'ios.none': {
-      binaryPath:
-        'ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app',
+      binaryPath: 'ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app',
       type: 'ios.none',
       name: 'iPhone 13',
       session: {
@@ -115,10 +117,6 @@ const config = {
       app: 'android.release',
       device: 'emulator',
     },
-    'android.genycloud.release': {
-      app: 'android.release',
-      device: 'genymotion.emulator.name',
-    },
   },
 };
 

playground/e2e/detox.config.js

@@ -12,10 +12,10 @@ const CI = includes(process.argv, '--ci');
 run();
 
 function run() {
-  const prefix = android ? (CI ? `android.genycloud` : `android.emu`) : `ios.sim`;
-  const suffix = release ? `release` : `debug`;
+  const prefix = android ? 'android.emu' : 'ios.sim';
+  const suffix = release ? 'release' : 'debug';
   const configuration = `${prefix}.${suffix}`;
-  const headless$ = android ? (headless ? `--headless` : ``) : ``;
+  const headless$ = android ? (headless ? '--headless' : '') : '';
   const workers = multi ? 3 : 1;
   const loglevel = verbose ? '--loglevel verbose' : '';