Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 29ac5e4
Author: Ward Abbass <swabbass@gmail.com>
Date:   Mon Nov 29 10:40:14 2021 +0200

    Upgrade Android unit tests tools (#7379)

    * tmp

    * Upgrade unit tests dependencies on android

commit bcf0edb
Author: Yogev Ben David <yogev132@gmail.com>
Date:   Thu Nov 25 13:32:27 2021 +0200

    Fix playground reanimated animations (#7375)

commit 623c239
Author: Yogev Ben David <yogev132@gmail.com>
Date:   Thu Nov 25 11:37:42 2021 +0200

    Fix missing options processing (#7370)

    We missed `mergeOptions` processing on the following commands: `pop`, `popTo`, `popToRoot`, `dismissModal` and `dismissAllModals`. That resulted in a bug where using the old animations syntax didn't work.

commit e0da767
Author: Yogev Ben David <yogev132@gmail.com>
Date:   Thu Nov 25 11:37:13 2021 +0200

    Fix statusBar blur option in dark mode (#7372)

commit 74beb27
Author: Yogev Ben David <yogev132@gmail.com>
Date:   Thu Nov 25 11:36:56 2021 +0200

    Update documentation (#7373)

commit 6452157
Author: Yogev Ben David <yogev132@gmail.com>
Date:   Wed Nov 24 23:20:11 2021 +0200

    Fix fast refresh crash (#7371)

    Closes #6176

commit 709ddb8
Author: Yogev Ben David <yogev132@gmail.com>
Date:   Wed Nov 24 21:37:22 2021 +0200

    Fix dismissing modals with sideMenu (#7369)

    Dismissing a modal that has a `sideMenu` layout exposed a bug we have where we look for the component in the top ViewController presented children, with `sideMenu` it's not enough because its children are not components.
    Instead, We should recursively look for that component in all of the top viewController children tree.

    Closes #7367

commit 5cc967b
Author: Yogev Ben David <yogev132@gmail.com>
Date:   Wed Nov 24 15:26:08 2021 +0200

    [Navigation Mock] Fix bottomTabPressed event (#7368)
  • Loading branch information
swabbass committed Nov 29, 2021
1 parent 36fd951 commit 0842567
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions e2e/BottomTabs.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Utils from './Utils';
import TestIDs from '../playground/src/testIDs';
import Android from "./AndroidUtils";
import Android from './AndroidUtils';

const { elementByLabel, elementById } = Utils;

Expand Down Expand Up @@ -115,27 +115,27 @@ describe('BottomTabs', () => {
await expect(elementByLabel('First Tab')).toBeVisible();
});

it(':android: hardware back tab selection history', async () => {
await elementById(TestIDs.SECOND_TAB_BAR_BTN).tap();
await elementById(TestIDs.FIRST_TAB_BAR_BUTTON).tap();
await elementById(TestIDs.SECOND_TAB_BAR_BTN).tap();
await elementById(TestIDs.SECOND_TAB_BAR_BTN).tap();
await elementById(TestIDs.FIRST_TAB_BAR_BUTTON).tap();
it(':android: hardware back tab selection history', async () => {
await elementById(TestIDs.SECOND_TAB_BAR_BTN).tap();
await elementById(TestIDs.FIRST_TAB_BAR_BUTTON).tap();
await elementById(TestIDs.SECOND_TAB_BAR_BTN).tap();
await elementById(TestIDs.SECOND_TAB_BAR_BTN).tap();
await elementById(TestIDs.FIRST_TAB_BAR_BUTTON).tap();

await Android.pressBack();
await expect(elementByLabel('Second Tab')).toBeVisible();
await Android.pressBack();
await expect(elementByLabel('Second Tab')).toBeVisible();

await Android.pressBack();
await expect(elementByLabel('First Tab')).toBeVisible();
await Android.pressBack();
await expect(elementByLabel('First Tab')).toBeVisible();

await Android.pressBack();
await expect(elementByLabel('Second Tab')).toBeVisible();
await Android.pressBack();
await expect(elementByLabel('Second Tab')).toBeVisible();

await Android.pressBack();
await expect(elementByLabel('First Tab')).toBeVisible();
await Android.pressBack();
await expect(elementByLabel('First Tab')).toBeVisible();

await Android.pressBack();
await expect(elementByLabel('First Tab')).toBeNotVisible();
await expect(elementByLabel('Second Tab')).toBeNotVisible();
});
await Android.pressBack();
await expect(elementByLabel('First Tab')).toBeNotVisible();
await expect(elementByLabel('Second Tab')).toBeNotVisible();
});
});

0 comments on commit 0842567

Please sign in to comment.