diff --git a/e2e/tests/assorted/01-e2eencryption.spec.ts b/e2e/tests/assorted/01-e2eencryption.spec.ts index 5a1069bcb..e755437cf 100644 --- a/e2e/tests/assorted/01-e2eencryption.spec.ts +++ b/e2e/tests/assorted/01-e2eencryption.spec.ts @@ -291,11 +291,6 @@ describe('E2E Encryption', () => { .withTimeout(2000); }); it('should reset e2e key', async () => { - // FIXME: too flaky on Android for now... let's fix it later - // It's also flaky on iOS, but it works from time to time - if (device.getPlatform() === 'android') { - return; - } await navigateSecurityPrivacy(); await element(by.id('security-privacy-view-e2e-encryption')).tap(); await waitFor(element(by.id('e2e-encryption-security-view'))) @@ -332,14 +327,6 @@ describe('E2E Encryption', () => { }); describe('Persist Banner', () => { - beforeAll(async () => { - // reinstall the app because of one flaky test above - if (device.getPlatform() === 'android') { - await device.launchApp({ permissions: { notifications: 'YES' }, delete: true }); - await navigateToLogin(); - await login(user.username, user.password); - } - }); it('check save banner', async () => { await checkServer(data.server); await checkBanner(); diff --git a/e2e/tests/assorted/05-joinpublicroom.spec.ts b/e2e/tests/assorted/05-joinpublicroom.spec.ts index 2ef99fbd9..4681d86a4 100644 --- a/e2e/tests/assorted/05-joinpublicroom.spec.ts +++ b/e2e/tests/assorted/05-joinpublicroom.spec.ts @@ -173,7 +173,7 @@ describe('Join public room', () => { .withTimeout(10000); await waitFor(element(by.id(`rooms-list-view-item-${room}`))) .toBeNotVisible() - .withTimeout(60000); // flaky on Android + .withTimeout(60000); }); }); }); diff --git a/e2e/tests/assorted/12-i18n.spec.ts b/e2e/tests/assorted/12-i18n.spec.ts index 3d8e8c534..dea038600 100644 --- a/e2e/tests/assorted/12-i18n.spec.ts +++ b/e2e/tests/assorted/12-i18n.spec.ts @@ -29,9 +29,9 @@ const navToLanguage = async () => { describe('i18n', () => { describe('OS language', () => { it("OS set to 'en' and proper translate to 'en'", async () => { - if (device.getPlatform() === 'android') { - return; // FIXME: Passing language with launch parameters doesn't work with Android - } + // if (device.getPlatform() === 'android') { + // return; // FIXME: Passing language with launch parameters doesn't work with Android + // } await device.launchApp({ ...defaultLaunchArgs, languageAndLocale: { @@ -47,9 +47,9 @@ describe('i18n', () => { }); it("OS set to unavailable language and fallback to 'en'", async () => { - if (device.getPlatform() === 'android') { - return; // FIXME: Passing language with launch parameters doesn't work with Android - } + // if (device.getPlatform() === 'android') { + // return; // FIXME: Passing language with launch parameters doesn't work with Android + // } await device.launchApp({ ...defaultLaunchArgs, languageAndLocale: { diff --git a/e2e/tests/room/05-threads.spec.ts b/e2e/tests/room/05-threads.spec.ts index 8496cc738..3b49d06b4 100644 --- a/e2e/tests/room/05-threads.spec.ts +++ b/e2e/tests/room/05-threads.spec.ts @@ -53,9 +53,7 @@ describe('Threads', () => { }); it('should have open emoji button', async () => { - if (device.getPlatform() === 'android') { - await expect(element(by.id('messagebox-open-emoji'))).toExist(); - } + await expect(element(by.id('messagebox-open-emoji'))).toExist(); }); it('should have message input', async () => { diff --git a/e2e/tests/room/09-jumptomessage.spec.ts b/e2e/tests/room/09-jumptomessage.spec.ts index 3aca601a1..73537ad8b 100644 --- a/e2e/tests/room/09-jumptomessage.spec.ts +++ b/e2e/tests/room/09-jumptomessage.spec.ts @@ -36,10 +36,10 @@ async function clearCache() { } async function waitForLoading() { - if (device.getPlatform() === 'android') { - await sleep(10000); - return; // FIXME: Loading indicator doesn't animate properly on android - } + // if (device.getPlatform() === 'android') { + // await sleep(10000); + // return; // FIXME: Loading indicator doesn't animate properly on android + // } await waitFor(element(by.id('loading-image'))) .toBeVisible() .withTimeout(5000); @@ -125,10 +125,6 @@ describe('Room', () => { }); it('should load newer and older messages', async () => { - // TODO: couldn't make it work on Android :( - if (device.getPlatform() === 'android') { - return; - } let found = false; while (!found) { try {