906662 - Fix openAboutHomeTab to work with the changes to the tablet about:home UI

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect, P1)

Description

[Adrian Tamas (:AdrianT)]

Attachment: openAboutHomeTabFix.patch

It seems that waitForEnabledText does not work anymore for this test since in the Tablet UI  the tabs titles are now always enabled. I am adding a waitForAboutHomeTab method to wait for the tab to be changed after dragging left or right. This should fix the fails of testWebContentContextMenu.

Comment 1

[Lucas Rocha (:lucasr)]

Comment on attachment 792189 [details] [diff] [review]
openAboutHomeTabFix.patch

Review of attachment 792189 [details] [diff] [review]:
-----------------------------------------------------------------

Good.

::: mobile/android/base/tests/AboutHomeTest.java.in
@@ +307,5 @@
>          }
>      }
>  
> +   // A wait in order for the about:home tab to be rendered after drag/tab selection
> +    private void waitForAboutHomeTab(final int tabNumber) {

Rename to tabIndex.

@@ +312,5 @@
> +        boolean correctTab = waitForTest(new BooleanTest() {
> +            @Override
> +            public boolean test() {
> +              ViewPager pager = (ViewPager)mSolo.getView(ViewPager.class, 0);
> +              if (pager.getCurrentItem() == tabNumber) {

Change that to simply:

return (pager.getCurrentItem() == tabNumber)

@@ +334,5 @@
>          ViewPager pager = (ViewPager)mSolo.getView(ViewPager.class, 0);
>          switch (tab) {
>              case BOOKMARKS : {
> +                mSolo.clickOnText(BOOKMARKS_LABEL);
> +                waitForAboutHomeTab(aboutHomeTabs.indexOf(tab.toString()));

tab.toString() -> BOOKMARKS_LABEL ?

Comment 2

[Adrian Tamas (:AdrianT)]

Attachment: openAboutHomeTab fix

Made the requested changes

Comment 3

[Lucas Rocha (:lucasr)]

Pushed to try: https://tbpl.mozilla.org/?tree=Try&rev=115b5b1dd8d5

Comment 4

[Lucas Rocha (:lucasr)]

The orangeness in the try build is caused by an intermittent failure in testWebContentContextMenu which has been backed out now.

Pushed: https://hg.mozilla.org/projects/fig/rev/1d639fdd1f26

Comment 5

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/1d639fdd1f26