diff --git a/e2e/Overlay.test.js b/e2e/Overlay.test.js index 029af0bc777..c18bbbd70e5 100644 --- a/e2e/Overlay.test.js +++ b/e2e/Overlay.test.js @@ -58,12 +58,15 @@ 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) diff --git a/e2e/assets/overlay_banner_padding.png b/e2e/assets/overlay_banner_padding.png index cb857bc04cb..7c43486b684 100644 Binary files a/e2e/assets/overlay_banner_padding.png and b/e2e/assets/overlay_banner_padding.png differ diff --git a/package.json b/package.json index 44a4e4af1d2..abf6a777bd8 100644 --- a/package.json +++ b/package.json @@ -162,16 +162,10 @@ "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_34" + "avdName": "Pixel_3a_API_35" } } }, @@ -246,10 +240,6 @@ "android.emu.release": { "app": "android.release", "device": "emulator" - }, - "android.genycloud.release": { - "app": "android.release", - "device": "genymotion.emulator.name" } } }, @@ -258,4 +248,4 @@ "type": "all", "jsSrcsDir": "./lib/src" } -} \ No newline at end of file +} diff --git a/playground/android/app/src/main/res/values/styles.xml b/playground/android/app/src/main/res/values/styles.xml index 7879f972437..b52f03012e2 100644 --- a/playground/android/app/src/main/res/values/styles.xml +++ b/playground/android/app/src/main/res/values/styles.xml @@ -2,5 +2,6 @@ \ No newline at end of file diff --git a/scripts/test-e2e.js b/scripts/test-e2e.js index dbf45357028..c80b5f85b27 100644 --- a/scripts/test-e2e.js +++ b/scripts/test-e2e.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' : '';