From 48ec6a81c529dfbce4818067c5247b8078f33991 Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechnoworld.mohit@gmail.com>
Date: Mon, 18 Aug 2025 18:30:54 +0530
Subject: [PATCH] Fixed: `testBookMarkPageOpenInReader` which was failing on
 API level 25, and 30.

---
 .../androidTest/java/org/kiwix/kiwixmobile/note/NoteRobot.kt   | 1 -
 .../org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt     | 3 +--
 .../kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt   | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteRobot.kt
index 9915086a7..86936f53d 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteRobot.kt
@@ -304,7 +304,6 @@ class NoteRobot : BaseRobot() {
               "//*[contains(text(), 'History')]"
             )
           )
-          .perform(webClick())
       }
     })
   }
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt
index 27dab1c5f..2e1b0f4a2 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt
@@ -114,6 +114,7 @@ class BookmarksRobot : BaseRobot() {
   fun clickOnSaveBookmarkImage(composeTestRule: ComposeContentTestRule) {
     composeTestRule.apply {
       waitForIdle()
+      waitUntilTimeout()
       waitUntil(TEST_PAUSE_MS_FOR_DOWNLOAD_TEST.toLong()) {
         onNodeWithTag(READER_BOTTOM_BAR_BOOKMARK_BUTTON_TESTING_TAG).isDisplayed()
       }
@@ -194,7 +195,6 @@ class BookmarksRobot : BaseRobot() {
 
   fun assertZimFileLoadedIntoTheReader(composeTestRule: ComposeContentTestRule) {
     composeTestRule.apply {
-      waitUntilTimeout()
       composeTestRule.apply {
         waitUntilTimeout()
         onNodeWithTag(BOTTOM_NAV_READER_ITEM_TESTING_TAG).performClick()
@@ -238,7 +238,6 @@ class BookmarksRobot : BaseRobot() {
               "//*[contains(text(), 'History')]"
             )
           )
-          .perform(webClick())
       }
     })
   }
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt
index c6ec4c07a..3703b44e6 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt
@@ -189,6 +189,7 @@ class LibkiwixBookmarkTest : BaseActivityTest() {
       clickOnAndroidArticle(composeTestRule)
       waitComposeToSettleViews()
       assertAndroidArticleLoadedInReader(composeTestRule)
+      waitComposeToSettleViews()
       // Save bookmark
       clickOnSaveBookmarkImage(composeTestRule)
       // open previous page